diff --git a/sysutils/rubygem-fluentd/Makefile b/sysutils/rubygem-fluentd/Makefile
index 1f63dbf02ab2..a7b8f08818d8 100644
--- a/sysutils/rubygem-fluentd/Makefile
+++ b/sysutils/rubygem-fluentd/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	fluentd
 PORTVERSION=	1.15.3
+PORTREVISION=	1
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	Fluent event collector
 WWW=		https://fluentd.org/
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	\
 	rubygem-bundler>=0:sysutils/rubygem-bundler \
 	rubygem-cool.io>=1.4.5<2.0.0:devel/rubygem-cool.io \
 	rubygem-http_parser.rb>=0.5.1<0.9.0:net/rubygem-http_parser.rb \
 	rubygem-msgpack>=1.3.1<2.0.0:devel/rubygem-msgpack \
 	rubygem-serverengine>=2.2.5<3.0.0:net/rubygem-serverengine \
 	rubygem-sigdump>=0.2.2<0.3:devel/rubygem-sigdump \
 	rubygem-strptime>=0.2.2<1.0.0:devel/rubygem-strptime \
 	rubygem-tzinfo1>=1.0<3.0:devel/rubygem-tzinfo1 \
 	rubygem-tzinfo-data>=1.0<2:devel/rubygem-tzinfo-data \
-	rubygem-webrick>=1.4.2<1.8.0:www/rubygem-webrick \
+	rubygem-webrick>=1.4.2<1.9.0:www/rubygem-webrick \
 	rubygem-yajl-ruby>=1.0<2:devel/rubygem-yajl-ruby
 
 PLIST_FILES=	bin/fluent-cap-ctl bin/fluent-cat bin/fluent-ctl \
 		bin/fluent-debug bin/fluent-gem bin/fluentd \
 		bin/fluent-binlog-reader bin/fluent-ca-generate \
 		bin/fluent-plugin-config-format bin/fluent-plugin-generate \
 		"@sample etc/fluentd/fluent.conf.sample"
 PLIST_DIRS=	etc/fluentd/plugin
 USES=		cpe gem
 USE_RC_SUBR=	fluentd
 USERS=		fluentd
 GROUPS=		fluentd
 SUB_LIST+=	USER=${USERS} GROUP=${GROUPS} RUBY=${RUBY}
 NO_ARCH=	YES
 NO_LATEST_LINK=	YES
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fluentd/plugin
 	${CP} ${WRKSRC}/fluent.conf.sample ${STAGEDIR}${PREFIX}/etc/fluentd/
 
 .include <bsd.port.mk>
diff --git a/sysutils/rubygem-fluentd/files/patch-gemspec b/sysutils/rubygem-fluentd/files/patch-gemspec
new file mode 100644
index 000000000000..5f60e0972ece
--- /dev/null
+++ b/sysutils/rubygem-fluentd/files/patch-gemspec
@@ -0,0 +1,11 @@
+--- fluentd.gemspec.orig	2023-01-31 16:59:07 UTC
++++ fluentd.gemspec
+@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
+   s.add_runtime_dependency(%q<tzinfo>.freeze, [">= 1.0", "< 3.0"])
+   s.add_runtime_dependency(%q<tzinfo-data>.freeze, ["~> 1.0"])
+   s.add_runtime_dependency(%q<strptime>.freeze, [">= 0.2.4", "< 1.0.0"])
+-  s.add_runtime_dependency(%q<webrick>.freeze, [">= 1.4.2", "< 1.8.0"])
++  s.add_runtime_dependency(%q<webrick>.freeze, [">= 1.4.2", "< 1.9.0"])
+   s.add_development_dependency(%q<rake>.freeze, ["~> 13.0"])
+   s.add_development_dependency(%q<flexmock>.freeze, ["~> 2.0"])
+   s.add_development_dependency(%q<parallel_tests>.freeze, ["~> 0.15.3"])