diff --git a/www/rubygem-sinatra/Makefile b/www/rubygem-sinatra/Makefile
index 680ffc6b7b82..838db987a807 100644
--- a/www/rubygem-sinatra/Makefile
+++ b/www/rubygem-sinatra/Makefile
@@ -1,26 +1,25 @@
 PORTNAME=	sinatra
-PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTVERSION=	3.0.2
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Classy web development framework in ruby
 WWW=		http://www.sinatrarb.com/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	rubygem-mustermann>=2.0:devel/rubygem-mustermann \
-		rubygem-rack>=2.2,3<3,3:www/rubygem-rack \
-		rubygem-rack-protection>=${PORTVERSION}:www/rubygem-rack-protection \
+RUN_DEPENDS=	rubygem-mustermann>=3.0<4:devel/rubygem-mustermann \
+		rubygem-rack>=2.2.4,3<3,3:www/rubygem-rack \
+		rubygem-rack-protection>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-rack-protection \
 		rubygem-tilt>=2.0<3:devel/rubygem-tilt
 
 USES=		cpe gem
 USE_RUBY=	yes
 
 NO_ARCH=	yes
 
 CPE_VENDOR=	sinatrarb
 
 .include <bsd.port.mk>
diff --git a/www/rubygem-sinatra/distinfo b/www/rubygem-sinatra/distinfo
index ccff7dad8982..b7af718adf0d 100644
--- a/www/rubygem-sinatra/distinfo
+++ b/www/rubygem-sinatra/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1659161337
-SHA256 (rubygem/sinatra-2.2.2.gem) = 7f335aa51fbe8e70452606e1c1c42b65bee3f58fa865154d3ab80cdfcab97255
-SIZE (rubygem/sinatra-2.2.2.gem) = 383488
+TIMESTAMP = 1664768180
+SHA256 (rubygem/sinatra-3.0.2.gem) = bf1b76903b3e638c0d75d2534a20c6b72d52b516ff090da34bbeaa2281af5b30
+SIZE (rubygem/sinatra-3.0.2.gem) = 132608
diff --git a/www/rubygem-sinatra/files/patch-gemspec b/www/rubygem-sinatra/files/patch-gemspec
deleted file mode 100644
index 7fc6531b17a1..000000000000
--- a/www/rubygem-sinatra/files/patch-gemspec
+++ /dev/null
@@ -1,11 +0,0 @@
---- sinatra.gemspec.orig	2022-09-11 06:39:09 UTC
-+++ sinatra.gemspec
-@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
-     s.add_runtime_dependency(%q<rack>.freeze, ["~> 2.2"])
-     s.add_runtime_dependency(%q<tilt>.freeze, ["~> 2.0"])
-     s.add_runtime_dependency(%q<rack-protection>.freeze, ["= 2.2.2"])
--    s.add_runtime_dependency(%q<mustermann>.freeze, ["~> 2.0"])
-+    s.add_runtime_dependency(%q<mustermann>.freeze, [">= 2.0"])
-   else
-     s.add_dependency(%q<rack>.freeze, ["~> 2.2"])
-     s.add_dependency(%q<tilt>.freeze, ["~> 2.0"])