diff --git a/news/nzbhydra2/Makefile b/news/nzbhydra2/Makefile
index 99db5cee0da1..3716b82f33a8 100644
--- a/news/nzbhydra2/Makefile
+++ b/news/nzbhydra2/Makefile
@@ -1,53 +1,54 @@
 PORTNAME=	nzbhydra2
 DISTVERSION=	5.3.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=		python zip
+USES=		python
 USE_JAVA=	yes
 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
+
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 SUB_FILES=	nzbhydra2
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
 		JAVA=${JAVA} \
 		DISTVERSION=${DISTVERSION}
 
 JAVA_VERSION=	17+
 JAVA_VENDOR=	openjdk
 JAVA_RUN=	yes
 
 USERS=		nzbhydra2
 GROUPS=		nzbhydra2
 
 PLIST_FILES=	${DATADIR}/lib/core-${DISTVERSION}-exec.jar \
 		${DATADIR}/nzbhydra2wrapperPy3.py \
 		${DATADIR}/changelog.md \
 		${DATADIR}/readme.md \
 		${DATADIR}/LICENSE
 
-post-extract:
-	# Cleanup unnecessary files
-	@${RM} -r ${WRKSRC}/systemd ${WRKSRC}/sysv ${WRKSRC}/rc.d \
-		${WRKSRC}/upstart ${WRKSRC}/nzbhydra2wrapper.py  \
-		${WRKSRC}/other ${WRKSRC}/executables ${WRKSRC}/WindowsService \
-		${WRKSRC}/NZBHydra2*
-
 do-install:
 	@${MKDIR} ${STAGEDIR}/${DATADIR}
 	${INSTALL} -d -m 755 ${STAGEDIR}/${DATADIR}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}/${DATADIR}
 
 .include <bsd.port.mk>