diff --git a/textproc/rarian/Makefile b/textproc/rarian/Makefile
index 2a06610757e7..e6335abe3abf 100644
--- a/textproc/rarian/Makefile
+++ b/textproc/rarian/Makefile
@@ -1,48 +1,46 @@
 PORTNAME=	rarian
-PORTVERSION=	0.8.5
+DISTVERSION=	0.8.5
 PORTREVISION=	6
 CATEGORIES=	textproc gnome
+MASTER_SITES=	https://gitlab.freedesktop.org/${PORTNAME}/${PORTNAME}/-/releases/${DISTVERSION}/downloads/assets/
 
 MAINTAINER=	truckman@FreeBSD.org
 COMMENT=	OMF help system based on the Freedesktop specification
 WWW=		https://rarian.freedesktop.org/
 
 LICENSE=	GPLv2+ LGPL21+ ZLIB
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING.UTILS
 LICENSE_FILE_LGPL21+ =	${WRKSRC}/COPYING.LIB
 LICENSE_FILE_ZLIB=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/getopt:misc/getopt \
 		bash:shells/bash \
 		xsltproc:textproc/libxslt \
 		docbook-xml>0:textproc/docbook-xml \
 		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl
 LIB_DEPENDS=	libtinyxml.so:textproc/tinyxml
 RUN_DEPENDS=	${LOCALBASE}/bin/getopt:misc/getopt \
 		bash:shells/bash \
 		xsltproc:textproc/libxslt \
 		docbook-xml>0:textproc/docbook-xml \
 		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl
 
-USES=		autoreconf gmake gnome libtool localbase pathfix pkgconfig tar:bzip2
-USE_GITLAB=	yes
-GL_SITE=	https://gitlab.freedesktop.org
-GL_TAGNAME=	0.8.5
+USES=		gmake libtool localbase pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--with-convert-dir=${LOCALBASE}/share/omf \
 		--with-default-data-dirs="${LOCALBASE}/share:/usr/share" \
 		--with-default-infopath="${LOCALBASE}/info:${LOCALBASE}/share/info" \
 		--with-default-manpath="/usr/share/man:${LOCALBASE}/share/man:${LOCALBASE}/man" \
 		--with-gnu-getopt=${LOCALBASE}/bin/getopt \
 		--with-localstate-subdir=db/rarian \
 		--with-metadata-dir=${DOCSDIR}
 
 INSTALL_TARGET=	install-strip
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|`getopt|`${LOCALBASE}/bin/getopt|' ${WRKSRC}/util/rarian-sk-update.in
 
 .include <bsd.port.mk>
diff --git a/textproc/rarian/distinfo b/textproc/rarian/distinfo
index d08566a105b4..f2d2374538a0 100644
--- a/textproc/rarian/distinfo
+++ b/textproc/rarian/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1704136985
-SHA256 (rarian-0.8.5.tar.bz2) = 93cf05e6bf51af169d0b32a2dc03f9a0f7895cae4e58b1a9b75777c040e9be0f
-SIZE (rarian-0.8.5.tar.bz2) = 91098
+TIMESTAMP = 1704155820
+SHA256 (rarian-0.8.5.tar.bz2) = 8ead8a0e70cbf080176effa6f288de55747f649c9bae9809aa967a81c7e987ed
+SIZE (rarian-0.8.5.tar.bz2) = 408968
diff --git a/textproc/rarian/files/patch-util_Makefile.in b/textproc/rarian/files/patch-util_Makefile.in
new file mode 100644
index 000000000000..0da1265a8540
--- /dev/null
+++ b/textproc/rarian/files/patch-util_Makefile.in
@@ -0,0 +1,11 @@
+--- util/Makefile.in.orig	2023-12-09 03:21:05 UTC
++++ util/Makefile.in
+@@ -987,7 +987,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIP
+ @ENABLE_INSTALL_TRUE@@ENABLE_SK_COMPAT_TRUE@	@cd $(DESTDIR)$(bindir); ln -s rarian-sk-rebuild scrollkeeper-rebuilddb
+ @ENABLE_INSTALL_TRUE@@ENABLE_SK_COMPAT_TRUE@	@cd $(DESTDIR)$(bindir); ln -s rarian-sk-install scrollkeeper-uninstall
+ @ENABLE_INSTALL_TRUE@@ENABLE_SK_COMPAT_TRUE@	@cd $(DESTDIR)$(bindir); ln -s rarian-sk-update scrollkeeper-update
+-@ENABLE_INSTALL_TRUE@@ENABLE_SK_COMPAT_TRUE@	@mkdir -p $(DESTDIR)/$(localstatedir)/lib/rarian
++@ENABLE_INSTALL_TRUE@@ENABLE_SK_COMPAT_TRUE@	@mkdir -p $(DESTDIR)/$(localstatedir)/db/rarian
+ @ENABLE_INSTALL_TRUE@@ENABLE_SKDB_UPDATE_TRUE@@ENABLE_SK_COMPAT_TRUE@	@echo "Translating current database"
+ @ENABLE_INSTALL_TRUE@@ENABLE_SKDB_UPDATE_TRUE@@ENABLE_SK_COMPAT_TRUE@	@$(DESTDIR)$(bindir)/rarian-sk-update
+