diff --git a/news/nzbhydra2/Makefile b/news/nzbhydra2/Makefile
index 4ab350892866..5de89b595281 100644
--- a/news/nzbhydra2/Makefile
+++ b/news/nzbhydra2/Makefile
@@ -1,53 +1,50 @@
 PORTNAME=	nzbhydra2
-DISTVERSION=	7.9.0
-PORTREVISION=	1
+DISTVERSION=	8.5.3
 DISTVERSIONSUFFIX=	-generic
 CATEGORIES=	news java
 MASTER_SITES=	https://github.com/theotherp/${PORTNAME}/releases/download/v${DISTVERSION}/
 
 MAINTAINER=	marcel@herrbischoff.com
 COMMENT=	Usenet meta search
 WWW=		https://github.com/theotherp/nzbhydra2
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64 powerpc64le
 
-USES=		java python
+USES=		java python zip
+JAVA_VERSION=	17
+JAVA_VENDOR=	openjdk
 USE_RC_SUBR=	nzbhydra2
 
-EXTRACT_SUFX=	.zip
-EXTRACT_AFTER_ARGS=	--exclude executables \
-			--exclude other \
-			--exclude WindowsService \
-			--exclude *.exe \
-			--exclude nzbhydra2wrapper.py \
-			--no-same-owner --no-same-permissions
-
+EXTRACT_BEFORE_ARGS=	-qo \
+			-x '*.exe' -x '*.cmd' \
+			-x WindowsService \
+			-x executables \
+			-x nzbhydra2wrapper.py \
+			-x other/* -x other
+NO_ARCH=	yes
 NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
-
 SUB_FILES=	nzbhydra2
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
 		JAVA=${JAVA} \
-		DISTVERSION=${DISTVERSION}
+		DISTVERSION=${DISTVERSION} \
+		USER=${USERS} \
+		GROUP=${GROUPS}
 
-JAVA_VERSION=	17+
-JAVA_VENDOR=	openjdk
+NO_WRKSUBDIR=	yes
 
 USERS=		nzbhydra2
 GROUPS=		nzbhydra2
 
-PLIST_FILES=	${DATADIR}/lib/core-${DISTVERSION}-exec.jar \
+PLIST_FILES=	${DATADIR}/changelog.md \
+		${DATADIR}/lib/core-${DISTVERSION}-exec.jar \
 		${DATADIR}/nzbhydra2wrapperPy3.py \
-		${DATADIR}/changelog.md \
-		${DATADIR}/readme.md \
-		${DATADIR}/LICENSE
+		${DATADIR}/readme.md
 
 do-install:
-	@${MKDIR} ${STAGEDIR}/${DATADIR}
-	${INSTALL} -d -m 755 ${STAGEDIR}/${DATADIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DATADIR}
+	(cd ${WRKSRC} && \
+		${COPYTREE_SHARE} . ${STAGEDIR}/${DATADIR} '! -name LICENSE')
 
 .include <bsd.port.mk>
diff --git a/news/nzbhydra2/distinfo b/news/nzbhydra2/distinfo
index 3cda51b8abcc..7cb9d1d6afda 100644
--- a/news/nzbhydra2/distinfo
+++ b/news/nzbhydra2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1731450205
-SHA256 (nzbhydra2-7.9.0-generic.zip) = 46b2368dc4a05bb2ced33fbd855699f75ab68134e3be589ab14407f9a8ddc389
-SIZE (nzbhydra2-7.9.0-generic.zip) = 189555711
+TIMESTAMP = 1775200000
+SHA256 (nzbhydra2-8.5.3-generic.zip) = c615373924f2702dabab5a4a92e62359fa8f780d8b2e09106f73fdd791420bdf
+SIZE (nzbhydra2-8.5.3-generic.zip) = 91877755
diff --git a/news/nzbhydra2/files/nzbhydra2.in b/news/nzbhydra2/files/nzbhydra2.in
index c20452637d24..43fb19266b7b 100644
--- a/news/nzbhydra2/files/nzbhydra2.in
+++ b/news/nzbhydra2/files/nzbhydra2.in
@@ -1,62 +1,62 @@
 #!/bin/sh
 
 # PROVIDE: nzbhydra2
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # nzbhydra2_enable (bool):	Set to NO by default.
 #			Set it to YES to enable it.
 # nzbhydra2_user:	The user account nzbhydra daemon runs as what
-#			you want it to be. It uses '_sabnzbd' user by
+#			you want it to be. It uses '%%USER%%' user by
 #			default. Do not sets it as empty or it will run
 #			as root.
 # nzbhydra2_group:	The group account nzbhydra daemon runs as what
-#			you want it to be. It uses 'nzbhydra2' group by
+#			you want it to be. It uses '%%GROUP%%' group by
 #			default. Do not sets it as empty or it will run
 #			as wheel.
 # nzbhydra2_dir:	Directory where nzbhydra lives.
-#			Default: %%PREFIX%%/share/nzbhydra2
+#			Default: %%DATADIR%%
 # nzbhydra2_data_dir:	Data directory for nzbhydra (DB, Logs, config)
 #			Default: %%PREFIX%%/nzbhydra2
 
 . /etc/rc.subr
 
 name="nzbhydra2"
 rcvar=${name}_enable
 
 load_rc_config ${name}
 
 : ${nzbhydra2_enable:="NO"}
-: ${nzbhydra2_user:="nzbhydra2"}
-: ${nzbhydra2_group:="nzbhydra2"}
-: ${nzbhydra2_dir:="%%PREFIX%%/share/nzbhydra2"}
+: ${nzbhydra2_user:="%%USER%%"}
+: ${nzbhydra2_group:="%%GROUP%%"}
+: ${nzbhydra2_dir:="%%DATADIR%%"}
 : ${nzbhydra2_data_dir:="%%PREFIX%%/nzbhydra2"}
 
 pidfile="/var/run/nzbhydra2/nzbhydra2.pid"
 command="%%PYTHON_CMD%%"
 command_args="${nzbhydra2_dir}/nzbhydra2wrapperPy3.py --datafolder ${nzbhydra2_data_dir} --pidfile ${pidfile} --daemon --nobrowser --java %%JAVA%%"
 start_precmd=nzbhydra2_precmd
 
 nzbhydra2_precmd() 
 {
 	export XDG_CONFIG_HOME=${nzbhydra2_data_dir}
 	export NZBHYDRA_DISABLE_UPDATE=1
 
-	find "%%PREFIX%%/share/nzbhydra2/lib/" ! -name "core-%%DISTVERSION%%-exec.jar" -delete
+	find "${nzbhydra2_dir}/lib/" ! -name "core-%%DISTVERSION%%-exec.jar" -delete
 
 	if [ -f ${pidfile} ]; then
 		rm -f ${pidfile}
 		echo "Removing stale pidfile."
 	elif [ ! -d ${pidfile%/*} ]; then
 		install -d -o ${nzbhydra2_user} -g ${nzbhydra2_group} ${pidfile%/*}
 	fi
 
 	if [ ! -d ${nzbhydra2_data_dir} ]; then
 		install -d -o ${nzbhydra2_user} -g ${nzbhydra2_group} ${nzbhydra2_data_dir}
 	fi
 }
 
 run_rc_command "$1"