diff --git a/textproc/rubygem-github-linguist/Makefile b/textproc/rubygem-github-linguist/Makefile
index f65bd07571d4..0acb4817243a 100644
--- a/textproc/rubygem-github-linguist/Makefile
+++ b/textproc/rubygem-github-linguist/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	github-linguist
 PORTVERSION=	7.21.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	GitHub Language detection
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-charlock_holmes>=0.7.7<0.8:textproc/rubygem-charlock_holmes \
-		rubygem-escape_utils12>=1.2.0<1.3:textproc/rubygem-escape_utils12 \
+RUN_DEPENDS=	rubygem-cgi>=0:www/rubygem-cgi \
+		rubygem-charlock_holmes>=0.7.7<0.8:textproc/rubygem-charlock_holmes \
 		rubygem-mini_mime>=1.0<2:mail/rubygem-mini_mime \
 		rubygem-rugged>=1.0<2:devel/rubygem-rugged
 
 USES=		gem
 USE_RUBY=	yes
 
 PLIST_FILES=	bin/git-linguist bin/github-linguist
 
 .include <bsd.port.mk>
diff --git a/textproc/rubygem-github-linguist/files/patch-escape_utils b/textproc/rubygem-github-linguist/files/patch-escape_utils
new file mode 100644
index 000000000000..241522704f34
--- /dev/null
+++ b/textproc/rubygem-github-linguist/files/patch-escape_utils
@@ -0,0 +1,36 @@
+--- lib/linguist/blob_helper.rb.orig	2022-06-23 13:30:27 UTC
++++ lib/linguist/blob_helper.rb
+@@ -1,6 +1,6 @@
+ require 'linguist/generated'
++require 'cgi'
+ require 'charlock_holmes'
+-require 'escape_utils'
+ require 'mini_mime'
+ require 'yaml'
+ 
+@@ -94,7 +94,7 @@ module Linguist
+       elsif name.nil?
+         "attachment"
+       else
+-        "attachment; filename=#{EscapeUtils.escape_url(name)}"
++        "attachment; filename=#{CGI.escape(name)}"
+       end
+     end
+ 
+--- lib/linguist/language.rb.orig	2022-06-23 13:30:27 UTC
++++ lib/linguist/language.rb
+@@ -1,4 +1,4 @@
+-require 'escape_utils'
++require 'cgi'
+ require 'yaml'
+ begin
+   require 'yajl'
+@@ -434,7 +434,7 @@ module Linguist
+     #
+     # Returns the escaped String.
+     def escaped_name
+-      EscapeUtils.escape_url(name).gsub('+', '%20')
++      CGI.escape(name).gsub('+', '%20')
+     end
+ 
+     # Public: Get default alias name
diff --git a/textproc/rubygem-github-linguist/files/patch-gemspec b/textproc/rubygem-github-linguist/files/patch-gemspec
new file mode 100644
index 000000000000..26e5a94c55da
--- /dev/null
+++ b/textproc/rubygem-github-linguist/files/patch-gemspec
@@ -0,0 +1,11 @@
+--- github-linguist.gemspec.orig	2022-06-17 15:51:08 UTC
++++ github-linguist.gemspec
+@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
+ 
+   if s.respond_to? :add_runtime_dependency then
+     s.add_runtime_dependency(%q<charlock_holmes>.freeze, ["~> 0.7.7"])
+-    s.add_runtime_dependency(%q<escape_utils>.freeze, ["~> 1.2.0"])
++    s.add_runtime_dependency(%q<cgi>.freeze, [">= 0"])
+     s.add_runtime_dependency(%q<mini_mime>.freeze, ["~> 1.0"])
+     s.add_runtime_dependency(%q<rugged>.freeze, ["~> 1.0"])
+     s.add_development_dependency(%q<minitest>.freeze, ["~> 5.15"])