diff --git a/www/rubygem-octopress/Makefile b/www/rubygem-octopress/Makefile
index e3377f68c73d..8b9aad7f4709 100644
--- a/www/rubygem-octopress/Makefile
+++ b/www/rubygem-octopress/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	octopress
 PORTVERSION=	3.0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
@@ -13,7 +13,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-jekyll3>=2.0:www/rubygem-jekyll3 \
-		rubygem-mercenary>=0.3.2<0.4:devel/rubygem-mercenary \
+		rubygem-mercenary>=0.3.2<1:devel/rubygem-mercenary \
 		rubygem-octopress-deploy>=0:net/rubygem-octopress-deploy \
 		rubygem-octopress-escape-code>=2.0<3:textproc/rubygem-octopress-escape-code \
 		rubygem-octopress-hooks>=2.0<3:devel/rubygem-octopress-hooks \
diff --git a/www/rubygem-octopress/files/patch-gemspec b/www/rubygem-octopress/files/patch-gemspec
new file mode 100644
index 000000000000..721995ef0302
--- /dev/null
+++ b/www/rubygem-octopress/files/patch-gemspec
@@ -0,0 +1,11 @@
+--- octopress.gemspec.orig	2020-01-19 08:56:10 UTC
++++ octopress.gemspec
+@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
+     s.specification_version = 4
+ 
+     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+-      s.add_runtime_dependency(%q<mercenary>.freeze, ["~> 0.3.2"])
++      s.add_runtime_dependency(%q<mercenary>.freeze, ["~> 0.3", ">= 0.3.2"])
+       s.add_runtime_dependency(%q<jekyll>.freeze, [">= 2.0"])
+       s.add_runtime_dependency(%q<titlecase>.freeze, [">= 0"])
+       s.add_runtime_dependency(%q<octopress-deploy>.freeze, [">= 0"])