diff --git a/www/rubygem-gollum/Makefile b/www/rubygem-gollum/Makefile
index 4370da79b426..70ef2c6b9eaa 100644
--- a/www/rubygem-gollum/Makefile
+++ b/www/rubygem-gollum/Makefile
@@ -1,46 +1,45 @@
 PORTNAME=	gollum
-DISTVERSION=	5.3.2
+DISTVERSION=	6.0.1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
 MAINTAINER=	sirl33tname@gmail.com
 COMMENT=	Simple wiki system built on top of Git
 WWW=		https://github.com/gollum/gollum
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	git:devel/git \
 		rubygem-gemojione>=4.1<5:graphics/rubygem-gemojione \
-		rubygem-gollum-lib>=5.2.3<6:www/rubygem-gollum-lib \
+		rubygem-gollum-lib>=6.0<7:www/rubygem-gollum-lib \
 		rubygem-i18n>=1.8:devel/rubygem-i18n \
 		rubygem-kramdown>=2.3<3:textproc/rubygem-kramdown \
 		rubygem-kramdown-parser-gfm>=1.1.0<1.2:textproc/rubygem-kramdown-parser-gfm \
 		rubygem-mustache-sinatra>=2.0<3:devel/rubygem-mustache-sinatra \
-		rubygem-octicons>=12.0:misc/rubygem-octicons \
+		rubygem-octicons>=19.0:misc/rubygem-octicons \
 		rubygem-rdoc>=6:devel/rubygem-rdoc \
 		rubygem-rss>=0.2.9:www/rubygem-rss \
-		rubygem-sass>=3.5<4:textproc/rubygem-sass \
-		rubygem-sinatra2>=2.0<3:www/rubygem-sinatra2 \
-		rubygem-sinatra-contrib2>=2.0<3:www/rubygem-sinatra-contrib2 \
-		rubygem-sprockets3>=3.7<4:devel/rubygem-sprockets3 \
+		rubygem-sinatra>=4.0.0<5:www/rubygem-sinatra \
+		rubygem-sinatra-contrib>=4.0.0<5:www/rubygem-sinatra-contrib \
+		rubygem-sprockets>=4.1<5:devel/rubygem-sprockets \
 		rubygem-sprockets-helpers>=1.2<2:devel/rubygem-sprockets-helpers \
-		rubygem-uglifier>=4.2<5:www/rubygem-uglifier \
 		rubygem-useragent>=0.16.2<0.17:devel/rubygem-useragent \
-		rubygem-webrick>=1.7<2:www/rubygem-webrick
+		rubygem-webrick>=1.7<2:www/rubygem-webrick \
+		rubygem-rackup>=2.1.0<3:www/rubygem-rackup
 
 USES=		cpe gem shebangfix
 CPE_VENDOR=	${PORTNAME}_project
 USE_RC_SUBR=	${PORTNAME}
 
 SHEBANG_FILES=	docker-run.sh
 NO_ARCH=	yes
 
 PLIST_DIRS=	${WWWDIR}
 PLIST_FILES=	bin/gollum \
 		bin/gollum-migrate-tags
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/gollum
 
 .include <bsd.port.mk>
diff --git a/www/rubygem-gollum/distinfo b/www/rubygem-gollum/distinfo
index 2399f580b0c7..c4552bf15a0e 100644
--- a/www/rubygem-gollum/distinfo
+++ b/www/rubygem-gollum/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1693144090
-SHA256 (rubygem/gollum-5.3.2.gem) = bde851664bdea743af92bdc4fc9ca00488dfe7a182643151c015bede5b249b1e
-SIZE (rubygem/gollum-5.3.2.gem) = 4858880
+TIMESTAMP = 1723737833
+SHA256 (rubygem/gollum-6.0.1.gem) = f16effd56f892e65a375dd5f6916802d9b3aac2be6bc75f5f527bb1ad647f305
+SIZE (rubygem/gollum-6.0.1.gem) = 5867008
diff --git a/www/rubygem-gollum/files/patch-gemspec b/www/rubygem-gollum/files/patch-gemspec
deleted file mode 100644
index a13164ba75ca..000000000000
--- a/www/rubygem-gollum/files/patch-gemspec
+++ /dev/null
@@ -1,18 +0,0 @@
---- gollum.gemspec.orig	2024-02-21 10:48:06 UTC
-+++ gollum.gemspec
-@@ -32,13 +32,12 @@ Gem::Specification.new do |s|
-   s.add_runtime_dependency(%q<mustache-sinatra>.freeze, ["~> 2.0".freeze])
-   s.add_runtime_dependency(%q<useragent>.freeze, ["~> 0.16.2".freeze])
-   s.add_runtime_dependency(%q<gemojione>.freeze, ["~> 4.1".freeze])
--  s.add_runtime_dependency(%q<octicons>.freeze, ["~> 12.0".freeze])
-+  s.add_runtime_dependency(%q<octicons>.freeze, [">= 12.0".freeze])
-   s.add_runtime_dependency(%q<sprockets>.freeze, ["~> 3.7".freeze])
-   s.add_runtime_dependency(%q<sass>.freeze, ["~> 3.5".freeze])
-   s.add_runtime_dependency(%q<uglifier>.freeze, ["~> 4.2".freeze])
-   s.add_runtime_dependency(%q<sprockets-helpers>.freeze, ["~> 1.2".freeze])
--  s.add_runtime_dependency(%q<rss>.freeze, ["~> 0.2.9".freeze])
--  s.add_runtime_dependency(%q<therubyrhino>.freeze, ["~> 2.1.0".freeze])
-+  s.add_runtime_dependency(%q<rss>.freeze, [">= 0.2.9".freeze])
-   s.add_runtime_dependency(%q<webrick>.freeze, ["~> 1.7".freeze])
-   s.add_runtime_dependency(%q<i18n>.freeze, ["~> 1.8".freeze])
-   s.add_development_dependency(%q<rack-test>.freeze, ["~> 0.6.3".freeze])
diff --git a/www/rubygem-gollum/files/patch-gollum.gemspec b/www/rubygem-gollum/files/patch-gollum.gemspec
new file mode 100644
index 000000000000..84dc0b83107d
--- /dev/null
+++ b/www/rubygem-gollum/files/patch-gollum.gemspec
@@ -0,0 +1,10 @@
+--- gollum.gemspec.orig	2024-08-15 16:05:42 UTC
++++ gollum.gemspec
+@@ -38,7 +38,6 @@ Gem::Specification.new do |s|
+   s.add_runtime_dependency(%q<sprockets>.freeze, ["~> 4.1".freeze])
+   s.add_runtime_dependency(%q<sprockets-helpers>.freeze, ["~> 1.2".freeze])
+   s.add_runtime_dependency(%q<rss>.freeze, ["~> 0.3".freeze])
+-  s.add_runtime_dependency(%q<therubyrhino>.freeze, ["~> 2.1.0".freeze])
+   s.add_runtime_dependency(%q<webrick>.freeze, ["~> 1.7".freeze])
+   s.add_runtime_dependency(%q<i18n>.freeze, ["~> 1.8".freeze])
+   s.add_development_dependency(%q<rack-test>.freeze, ["~> 0.6.3".freeze])