diff --git a/devel/rubygem-cucumber-core/Makefile b/devel/rubygem-cucumber-core/Makefile
index a2c684cb7e4a..50eeb795201c 100644
--- a/devel/rubygem-cucumber-core/Makefile
+++ b/devel/rubygem-cucumber-core/Makefile
@@ -1,21 +1,22 @@
 PORTNAME=	cucumber-core
 PORTVERSION=	11.1.0
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Core library for the Cucumber BDD app
 WWW=		https://github.com/cucumber/cucumber-ruby-core
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-cucumber-gherkin>=24<27:textproc/rubygem-cucumber-gherkin \
-		rubygem-cucumber-messages>=19<22:devel/rubygem-cucumber-messages \
+		rubygem-cucumber-messages>=19<22.1:devel/rubygem-cucumber-messages \
 		rubygem-cucumber-tag-expressions4>=4.1.0<5:devel/rubygem-cucumber-tag-expressions4
 
 USES=		gem
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/rubygem-cucumber-core/files/patch-gemspec b/devel/rubygem-cucumber-core/files/patch-gemspec
new file mode 100644
index 000000000000..c625b7906ba3
--- /dev/null
+++ b/devel/rubygem-cucumber-core/files/patch-gemspec
@@ -0,0 +1,11 @@
+--- cucumber-core.gemspec.orig	2023-04-09 15:39:17 UTC
++++ cucumber-core.gemspec
+@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
+   s.specification_version = 4
+ 
+   s.add_runtime_dependency(%q<cucumber-gherkin>.freeze, [">= 24", "< 27"])
+-  s.add_runtime_dependency(%q<cucumber-messages>.freeze, [">= 19", "< 22"])
++  s.add_runtime_dependency(%q<cucumber-messages>.freeze, [">= 19", "< 22.1"])
+   s.add_runtime_dependency(%q<cucumber-tag-expressions>.freeze, ["~> 4.1", ">= 4.1.0"])
+   s.add_development_dependency(%q<rake>.freeze, ["~> 13.0", ">= 13.0.6"])
+   s.add_development_dependency(%q<rspec>.freeze, ["~> 3.11", ">= 3.11.0"])