diff --git a/www/rubygem-addressable/Makefile b/www/rubygem-addressable/Makefile
index e7b990f9f6a1..cd172924a5ed 100644
--- a/www/rubygem-addressable/Makefile
+++ b/www/rubygem-addressable/Makefile
@@ -1,20 +1,22 @@
 PORTNAME=	addressable
 PORTVERSION=	2.8.0
+PORTREVISION=	1
 CATEGORIES=	www devel rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Replacement for the URI implementation
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	rubygem-public_suffix>=2.0.2<5:dns/rubygem-public_suffix
+RUN_DEPENDS=	rubygem-public_suffix>=2.0.2<6.0:dns/rubygem-public_suffix
 
 USES=		cpe gem
-CPE_VENDOR=	${PORTNAME}_project
 USE_RUBY=	yes
 
 NO_ARCH=	yes
 
+CPE_VENDOR=	addressable_project
+
 .include <bsd.port.mk>
diff --git a/www/rubygem-addressable/files/patch-gemspec b/www/rubygem-addressable/files/patch-gemspec
new file mode 100644
index 000000000000..57146852a110
--- /dev/null
+++ b/www/rubygem-addressable/files/patch-gemspec
@@ -0,0 +1,11 @@
+--- addressable.gemspec.orig	2022-07-30 15:35:35 UTC
++++ addressable.gemspec
+@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
+   end
+ 
+   if s.respond_to? :add_runtime_dependency then
+-    s.add_runtime_dependency(%q<public_suffix>.freeze, [">= 2.0.2", "< 5.0"])
++    s.add_runtime_dependency(%q<public_suffix>.freeze, [">= 2.0.2", "< 6.0"])
+     s.add_development_dependency(%q<bundler>.freeze, [">= 1.0", "< 3.0"])
+   else
+     s.add_dependency(%q<public_suffix>.freeze, [">= 2.0.2", "< 5.0"])