diff --git a/databases/rubygem-pg_query/Makefile b/databases/rubygem-pg_query/Makefile
index a4d792f4f391..af2526f2ddb8 100644
--- a/databases/rubygem-pg_query/Makefile
+++ b/databases/rubygem-pg_query/Makefile
@@ -1,24 +1,27 @@
 # Created by: Matthias Fechner <mfechner@FreeBSD.org>
 
 PORTNAME=	pg_query
 PORTVERSION=	2.0.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	databases rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Parses SQL queries using a copy of the PostgreSQL server query parser
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 MY_DEPENDS=	${LOCALBASE}/lib/libpg_query.a:databases/libpg_query
 BUILD_DEPENDS=	${MY_DEPENDS} \
 		rubygem-pathname>0:devel/rubygem-pathname
+# rubygem-google-protobuf 3.17.1 is required to fix a segfault
+# see PR: https://github.com/pganalyze/pg_query/pull/212
+# and https://github.com/pganalyze/pg_query/pull/213
 RUN_DEPENDS=	${MY_DEPENDS} \
-		rubygem-google-protobuf315>=3.15.5<3.16:devel/rubygem-google-protobuf315
+		rubygem-google-protobuf>=3.17.1:devel/rubygem-google-protobuf
 
 USES=		gem
 USE_RUBY=	yes
 
 .include <bsd.port.mk>
diff --git a/databases/rubygem-pg_query/files/patch-pg__query.gemspec b/databases/rubygem-pg_query/files/patch-pg__query.gemspec
new file mode 100644
index 000000000000..ea6d6d4d74e5
--- /dev/null
+++ b/databases/rubygem-pg_query/files/patch-pg__query.gemspec
@@ -0,0 +1,26 @@
+--- pg_query.gemspec.orig	2021-06-20 06:58:25 UTC
++++ pg_query.gemspec
+@@ -29,20 +29,20 @@ Gem::Specification.new do |s|
+       s.add_development_dependency(%q<rspec>.freeze, ["~> 3.0"])
+       s.add_development_dependency(%q<rubocop>.freeze, ["= 0.49.1"])
+       s.add_development_dependency(%q<rubocop-rspec>.freeze, ["= 1.15.1"])
+-      s.add_runtime_dependency(%q<google-protobuf>.freeze, ["~> 3.15.5"])
++      s.add_runtime_dependency(%q<google-protobuf>.freeze, [">= 3.17.1"])
+     else
+       s.add_dependency(%q<rake-compiler>.freeze, ["~> 0"])
+       s.add_dependency(%q<rspec>.freeze, ["~> 3.0"])
+       s.add_dependency(%q<rubocop>.freeze, ["= 0.49.1"])
+       s.add_dependency(%q<rubocop-rspec>.freeze, ["= 1.15.1"])
+-      s.add_dependency(%q<google-protobuf>.freeze, ["~> 3.15.5"])
++      s.add_dependency(%q<google-protobuf>.freeze, [">= 3.17.1"])
+     end
+   else
+     s.add_dependency(%q<rake-compiler>.freeze, ["~> 0"])
+     s.add_dependency(%q<rspec>.freeze, ["~> 3.0"])
+     s.add_dependency(%q<rubocop>.freeze, ["= 0.49.1"])
+     s.add_dependency(%q<rubocop-rspec>.freeze, ["= 1.15.1"])
+-    s.add_dependency(%q<google-protobuf>.freeze, ["~> 3.15.5"])
++    s.add_dependency(%q<google-protobuf>.freeze, [">= 3.17.1"])
+   end
+ end
+