diff --git a/sysutils/rubygem-r10k/Makefile b/sysutils/rubygem-r10k/Makefile
index 7c1c0fadc429..6b04bfd95f46 100644
--- a/sysutils/rubygem-r10k/Makefile
+++ b/sysutils/rubygem-r10k/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	r10k
 PORTVERSION=	3.9.3
+PORTREVISION=	1
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	Tool for deploying Puppet environments and modules
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-colored2>=3.1.2:textproc/rubygem-colored2 \
 		rubygem-cri>=2.15.6:devel/rubygem-cri \
 		rubygem-gettext-setup>=0.24:devel/rubygem-gettext-setup \
 		rubygem-log4r>=1.1.10:sysutils/rubygem-log4r \
 		rubygem-multi_json>=1.10:devel/rubygem-multi_json \
 		rubygem-puppet_forge>=2.3.0:sysutils/rubygem-puppet_forge
 
 USES=		gem
 USE_RUBY=	yes
 
 NO_ARCH=	yes
 
 PLIST_FILES=	bin/r10k
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
 		${WRKSRC}/lib/r10k/settings.rb \
 		${WRKSRC}/lib/r10k/settings/loader.rb
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-r10k/files/patch-r10k.gemspec b/sysutils/rubygem-r10k/files/patch-r10k.gemspec
index 94479378fc88..5259c27bac10 100644
--- a/sysutils/rubygem-r10k/files/patch-r10k.gemspec
+++ b/sysutils/rubygem-r10k/files/patch-r10k.gemspec
@@ -1,35 +1,52 @@
---- r10k.gemspec.orig	2021-04-30 19:31:50 UTC
+--- r10k.gemspec.orig	2021-07-14 21:11:15 UTC
 +++ r10k.gemspec
-@@ -29,8 +29,8 @@ Gem::Specification.new do |s|
+@@ -24,26 +24,26 @@ Gem::Specification.new do |s|
+ 
+     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+       s.add_runtime_dependency(%q<colored2>.freeze, ["= 3.1.2"])
+-      s.add_runtime_dependency(%q<cri>.freeze, ["= 2.15.10"])
++      s.add_runtime_dependency(%q<cri>.freeze, ["~> 2.15.10"])
+       s.add_runtime_dependency(%q<log4r>.freeze, ["= 1.1.10"])
        s.add_runtime_dependency(%q<multi_json>.freeze, ["~> 1.10"])
        s.add_runtime_dependency(%q<puppet_forge>.freeze, ["~> 2.3.0"])
        s.add_runtime_dependency(%q<gettext-setup>.freeze, ["~> 0.24"])
 -      s.add_runtime_dependency(%q<fast_gettext>.freeze, ["~> 1.1.0"])
 -      s.add_runtime_dependency(%q<gettext>.freeze, [">= 3.0.2", "< 3.3.0"])
 +      s.add_runtime_dependency(%q<fast_gettext>.freeze, ["~> 1.1"])
 +      s.add_runtime_dependency(%q<gettext>.freeze, [">= 3.0.2", "< 3.4.0"])
        s.add_development_dependency(%q<rspec>.freeze, ["~> 3.1"])
        s.add_development_dependency(%q<rake>.freeze, [">= 0"])
        s.add_development_dependency(%q<yard>.freeze, ["~> 0.9.11"])
-@@ -42,8 +42,8 @@ Gem::Specification.new do |s|
+       s.add_development_dependency(%q<minitar>.freeze, ["~> 0.9.0"])
+     else
+       s.add_dependency(%q<colored2>.freeze, ["= 3.1.2"])
+-      s.add_dependency(%q<cri>.freeze, ["= 2.15.10"])
++      s.add_dependency(%q<cri>.freeze, ["~> 2.15.10"])
+       s.add_dependency(%q<log4r>.freeze, ["= 1.1.10"])
        s.add_dependency(%q<multi_json>.freeze, ["~> 1.10"])
        s.add_dependency(%q<puppet_forge>.freeze, ["~> 2.3.0"])
        s.add_dependency(%q<gettext-setup>.freeze, ["~> 0.24"])
 -      s.add_dependency(%q<fast_gettext>.freeze, ["~> 1.1.0"])
 -      s.add_dependency(%q<gettext>.freeze, [">= 3.0.2", "< 3.3.0"])
 +      s.add_dependency(%q<fast_gettext>.freeze, ["~> 1.1"])
 +      s.add_dependency(%q<gettext>.freeze, [">= 3.0.2", "< 3.4.0"])
        s.add_dependency(%q<rspec>.freeze, ["~> 3.1"])
        s.add_dependency(%q<rake>.freeze, [">= 0"])
        s.add_dependency(%q<yard>.freeze, ["~> 0.9.11"])
-@@ -56,8 +56,8 @@ Gem::Specification.new do |s|
+@@ -51,13 +51,13 @@ Gem::Specification.new do |s|
+     end
+   else
+     s.add_dependency(%q<colored2>.freeze, ["= 3.1.2"])
+-    s.add_dependency(%q<cri>.freeze, ["= 2.15.10"])
++    s.add_dependency(%q<cri>.freeze, ["~> 2.15.10"])
+     s.add_dependency(%q<log4r>.freeze, ["= 1.1.10"])
      s.add_dependency(%q<multi_json>.freeze, ["~> 1.10"])
      s.add_dependency(%q<puppet_forge>.freeze, ["~> 2.3.0"])
      s.add_dependency(%q<gettext-setup>.freeze, ["~> 0.24"])
 -    s.add_dependency(%q<fast_gettext>.freeze, ["~> 1.1.0"])
 -    s.add_dependency(%q<gettext>.freeze, [">= 3.0.2", "< 3.3.0"])
 +    s.add_dependency(%q<fast_gettext>.freeze, ["~> 1.1"])
 +    s.add_dependency(%q<gettext>.freeze, [">= 3.0.2", "< 3.4.0"])
      s.add_dependency(%q<rspec>.freeze, ["~> 3.1"])
      s.add_dependency(%q<rake>.freeze, [">= 0"])
      s.add_dependency(%q<yard>.freeze, ["~> 0.9.11"])