diff --git a/mail/rubygem-gitlab-mail_room/Makefile b/mail/rubygem-gitlab-mail_room/Makefile
index 6c600c426f7b..42170d377932 100644
--- a/mail/rubygem-gitlab-mail_room/Makefile
+++ b/mail/rubygem-gitlab-mail_room/Makefile
@@ -1,25 +1,25 @@
 PORTNAME=	gitlab-mail_room
-PORTVERSION=	0.0.19
-PORTREVISION=	1
+PORTVERSION=	0.0.20
+PORTREVISION=	0
 CATEGORIES=	mail rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Proxy email (gmail) from IMAP to a delivery method
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	rubygem-io-wait01>=0.1.0<0.2:devel/rubygem-io-wait01 \
 		rubygem-jwt>=2.0:www/rubygem-jwt \
 		rubygem-net-imap>=0.2.1:mail/rubygem-net-imap \
-		rubygem-oauth21>=1.4.4<1.5:net/rubygem-oauth21
+		rubygem-oauth2>=1.4.4<3:net/rubygem-oauth2
 
 USES=		gem
 USE_RUBY=	yes
 
 NO_ARCH=	yes
 
 PLIST_FILES=	bin/mail_room
 
 .include <bsd.port.mk>
diff --git a/mail/rubygem-gitlab-mail_room/distinfo b/mail/rubygem-gitlab-mail_room/distinfo
index d4e1dd8e09e0..26753f613a0f 100644
--- a/mail/rubygem-gitlab-mail_room/distinfo
+++ b/mail/rubygem-gitlab-mail_room/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1644247424
-SHA256 (rubygem/gitlab-mail_room-0.0.19.gem) = a300f9738fcb8857545374c52e09bafe743bc7755354c4ffb92ecb83cafd8ce2
-SIZE (rubygem/gitlab-mail_room-0.0.19.gem) = 39424
+TIMESTAMP = 1658822497
+SHA256 (rubygem/gitlab-mail_room-0.0.20.gem) = 8f22646bb02cc1b42d519beaa26dca29077dd63f0b0801d321d2175f0b391cac
+SIZE (rubygem/gitlab-mail_room-0.0.20.gem) = 40448
diff --git a/mail/rubygem-gitlab-mail_room/files/patch-gitlab-mail__room.gemspec b/mail/rubygem-gitlab-mail_room/files/patch-gitlab-mail__room.gemspec
new file mode 100644
index 000000000000..7e2e5cbca0a2
--- /dev/null
+++ b/mail/rubygem-gitlab-mail_room/files/patch-gitlab-mail__room.gemspec
@@ -0,0 +1,20 @@
+--- gitlab-mail_room.gemspec.orig	2022-07-26 08:03:24 UTC
++++ gitlab-mail_room.gemspec
+@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
+ 
+   if s.respond_to? :add_runtime_dependency then
+     s.add_runtime_dependency(%q<net-imap>.freeze, [">= 0.2.1"])
+-    s.add_runtime_dependency(%q<oauth2>.freeze, ["~> 1.4.4"])
++    s.add_runtime_dependency(%q<oauth2>.freeze, ["~> 2.0.0"])
+     s.add_runtime_dependency(%q<jwt>.freeze, [">= 2.0"])
+     s.add_runtime_dependency(%q<io-wait>.freeze, ["~> 0.1.0"])
+     s.add_development_dependency(%q<rake>.freeze, [">= 0"])
+@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
+     s.add_development_dependency(%q<webmock>.freeze, [">= 0"])
+   else
+     s.add_dependency(%q<net-imap>.freeze, [">= 0.2.1"])
+-    s.add_dependency(%q<oauth2>.freeze, ["~> 1.4.4"])
++    s.add_dependency(%q<oauth2>.freeze, ["~> 2.0.0"])
+     s.add_dependency(%q<jwt>.freeze, [">= 2.0"])
+     s.add_dependency(%q<io-wait>.freeze, ["~> 0.1.0"])
+     s.add_dependency(%q<rake>.freeze, [">= 0"])