diff --git a/devel/rubygem-gitlab-labkit/Makefile b/devel/rubygem-gitlab-labkit/Makefile
index 4ae381fd2acf..66d3d8daac94 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.17.1
+PORTVERSION=	0.18.0
 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-actionpack60>=5<7:www/rubygem-actionpack60 \
-		rubygem-activesupport60>=5<7:devel/rubygem-activesupport60 \
+RUN_DEPENDS=	rubygem-actionpack61>=5<7:www/rubygem-actionpack61 \
+		rubygem-activesupport61>=5<7:devel/rubygem-activesupport61 \
+		rubygem-pg_query>=2.0<3:databases/rubygem-pg_query \
 		rubygem-grpc>=1.19<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.0<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 59f31319130b..bf47b771d5b2 100644
--- a/devel/rubygem-gitlab-labkit/distinfo
+++ b/devel/rubygem-gitlab-labkit/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621461279
-SHA256 (rubygem/gitlab-labkit-0.17.1.gem) = c910999723770e39801d40c37dc32690964630c1ef8b7dfab724c85efb983af8
-SIZE (rubygem/gitlab-labkit-0.17.1.gem) = 27648
+TIMESTAMP = 1624172695
+SHA256 (rubygem/gitlab-labkit-0.18.0.gem) = 179b49708b26ee19221479e6f0f175fd763217646df4d89e154ae0464a7728b4
+SIZE (rubygem/gitlab-labkit-0.18.0.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..d14e56289333
--- /dev/null
+++ b/devel/rubygem-gitlab-labkit/files/patch-gitlab-labkit.gemspec
@@ -0,0 +1,29 @@
+--- gitlab-labkit.gemspec.orig	2021-06-20 07:05:41 UTC
++++ gitlab-labkit.gemspec
+@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
+       s.add_runtime_dependency(%q<grpc>.freeze, ["~> 1.19"])
+       s.add_runtime_dependency(%q<jaeger-client>.freeze, ["~> 1.1"])
+       s.add_runtime_dependency(%q<opentracing>.freeze, ["~> 0.4"])
+-      s.add_runtime_dependency(%q<gitlab-pg_query>.freeze, ["~> 2.0"])
++      s.add_runtime_dependency(%q<pg_query>.freeze, ["~> 2.0"])
+       s.add_runtime_dependency(%q<redis>.freeze, ["> 3.0.0", "< 5.0.0"])
+       s.add_development_dependency(%q<excon>.freeze, ["~> 0.78.1"])
+       s.add_development_dependency(%q<faraday>.freeze, ["~> 1.2.0"])
+@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
+       s.add_dependency(%q<grpc>.freeze, ["~> 1.19"])
+       s.add_dependency(%q<jaeger-client>.freeze, ["~> 1.1"])
+       s.add_dependency(%q<opentracing>.freeze, ["~> 0.4"])
+-      s.add_dependency(%q<gitlab-pg_query>.freeze, ["~> 2.0"])
++      s.add_dependency(%q<pg_query>.freeze, ["~> 2.0"])
+       s.add_dependency(%q<redis>.freeze, ["> 3.0.0", "< 5.0.0"])
+       s.add_dependency(%q<excon>.freeze, ["~> 0.78.1"])
+       s.add_dependency(%q<faraday>.freeze, ["~> 1.2.0"])
+@@ -72,7 +72,7 @@ Gem::Specification.new do |s|
+     s.add_dependency(%q<grpc>.freeze, ["~> 1.19"])
+     s.add_dependency(%q<jaeger-client>.freeze, ["~> 1.1"])
+     s.add_dependency(%q<opentracing>.freeze, ["~> 0.4"])
+-    s.add_dependency(%q<gitlab-pg_query>.freeze, ["~> 2.0"])
++    s.add_dependency(%q<pg_query>.freeze, ["~> 2.0"])
+     s.add_dependency(%q<redis>.freeze, ["> 3.0.0", "< 5.0.0"])
+     s.add_dependency(%q<excon>.freeze, ["~> 0.78.1"])
+     s.add_dependency(%q<faraday>.freeze, ["~> 1.2.0"])