diff --git a/devel/rubygem-gitlab-labkit/Makefile b/devel/rubygem-gitlab-labkit/Makefile
index 8a43f0897679..b49d1b41e38b 100644
--- a/devel/rubygem-gitlab-labkit/Makefile
+++ b/devel/rubygem-gitlab-labkit/Makefile
@@ -1,28 +1,28 @@
 # Created by: Matthias Fechner <mfechner@FreeBSD.org>
 
 PORTNAME=	gitlab-labkit
-PORTVERSION=	0.20.0
+PORTVERSION=	0.21.1
 PORTREVISION=	0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Instrumentation for GitLab
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-actionpack61>=5<7:www/rubygem-actionpack61 \
 		rubygem-activesupport61>=5<7:devel/rubygem-activesupport61 \
-		rubygem-grpc>=1.19<2:net/rubygem-grpc \
+		rubygem-grpc>=1.30.2<2:net/rubygem-grpc \
 		rubygem-jaeger-client>=1.1<2:devel/rubygem-jaeger-client \
 		rubygem-opentracing>=0.4<1.0:devel/rubygem-opentracing \
 		rubygem-pg_query>=2.1<3:databases/rubygem-pg_query \
 		rubygem-redis>3.0.0<5.0.0:databases/rubygem-redis
 
 USES=		gem
 USE_RUBY=	yes
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-gitlab-labkit/distinfo b/devel/rubygem-gitlab-labkit/distinfo
index 99a8783cf6bb..a9bcc5be2b40 100644
--- a/devel/rubygem-gitlab-labkit/distinfo
+++ b/devel/rubygem-gitlab-labkit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1627070231
-SHA256 (rubygem/gitlab-labkit-0.20.0.gem) = d9e060a27db9a684e8856c68355420aab9985c929fd737fec2bbc431e23636cf
-SIZE (rubygem/gitlab-labkit-0.20.0.gem) = 27648
+TIMESTAMP = 1630392923
+SHA256 (rubygem/gitlab-labkit-0.21.1.gem) = b8eedd54dfcf5aab95406ea06c82cbd473cfc8a78f4ac7ed5393e9c2e589ac27
+SIZE (rubygem/gitlab-labkit-0.21.1.gem) = 27648
diff --git a/devel/rubygem-gitlab-labkit/files/patch-gitlab-labkit.gemspec b/devel/rubygem-gitlab-labkit/files/patch-gitlab-labkit.gemspec
new file mode 100644
index 000000000000..f56a43d20000
--- /dev/null
+++ b/devel/rubygem-gitlab-labkit/files/patch-gitlab-labkit.gemspec
@@ -0,0 +1,29 @@
+--- gitlab-labkit.gemspec.orig	2021-08-31 07:01:11 UTC
++++ gitlab-labkit.gemspec
+@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
+     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+       s.add_runtime_dependency(%q<actionpack>.freeze, [">= 5.0.0", "< 7.0.0"])
+       s.add_runtime_dependency(%q<activesupport>.freeze, [">= 5.0.0", "< 7.0.0"])
+-      s.add_runtime_dependency(%q<grpc>.freeze, ["~> 1.30.2"])
++      s.add_runtime_dependency(%q<grpc>.freeze, ["~> 1.30"])
+       s.add_runtime_dependency(%q<jaeger-client>.freeze, ["~> 1.1"])
+       s.add_runtime_dependency(%q<opentracing>.freeze, ["~> 0.4"])
+       s.add_runtime_dependency(%q<pg_query>.freeze, ["~> 2.1"])
+@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
+     else
+       s.add_dependency(%q<actionpack>.freeze, [">= 5.0.0", "< 7.0.0"])
+       s.add_dependency(%q<activesupport>.freeze, [">= 5.0.0", "< 7.0.0"])
+-      s.add_dependency(%q<grpc>.freeze, ["~> 1.30.2"])
++      s.add_dependency(%q<grpc>.freeze, ["~> 1.30"])
+       s.add_dependency(%q<jaeger-client>.freeze, ["~> 1.1"])
+       s.add_dependency(%q<opentracing>.freeze, ["~> 0.4"])
+       s.add_dependency(%q<pg_query>.freeze, ["~> 2.1"])
+@@ -71,7 +71,7 @@ Gem::Specification.new do |s|
+   else
+     s.add_dependency(%q<actionpack>.freeze, [">= 5.0.0", "< 7.0.0"])
+     s.add_dependency(%q<activesupport>.freeze, [">= 5.0.0", "< 7.0.0"])
+-    s.add_dependency(%q<grpc>.freeze, ["~> 1.30.2"])
++    s.add_dependency(%q<grpc>.freeze, ["~> 1.30"])
+     s.add_dependency(%q<jaeger-client>.freeze, ["~> 1.1"])
+     s.add_dependency(%q<opentracing>.freeze, ["~> 0.4"])
+     s.add_dependency(%q<pg_query>.freeze, ["~> 2.1"])