diff --git a/net/akhq/Makefile b/net/akhq/Makefile
index d1f433e0d0da..6ee54f3635df 100644
--- a/net/akhq/Makefile
+++ b/net/akhq/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	akhq
 DISTVERSION=	0.25.1
 DISTVERSIONSUFFIX= -all
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net java
 MASTER_SITES=	https://github.com/tchiotludo/akhq/releases/download/${PORTVERSION}/
 EXTRACT_SUFX=	.jar
@@ -21,19 +21,16 @@ NO_BUILD=	yes
 SUB_FILES=	akhq
 SUB_LIST=	WWWOWN=${WWWOWN}
 
+NO_WRKSUBDIR=	yes
+
 PLIST_FILES=	"@sample ${ETCDIR}/application.yml.sample" \
 		${JAVASHAREDIR}/${PORTNAME}/${PORTNAME}.jar 
 PLIST_SUB+=     ${SUB_LIST}
 
-CONFIG_FILES=	application.yml
-
-NO_EXTRACT=	yes
-
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}
 	${INSTALL_DATA} ${DISTDIR}/${DISTFILES} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}/${PORTNAME}.jar
 	${INSTALL_DATA} ${FILESDIR}/application.yml ${STAGEDIR}${ETCDIR}/application.yml.sample
-	${INSTALL_DATA} ${FILESDIR}/application.yml ${STAGEDIR}${ETCDIR}/application.yml
 
 .include <bsd.port.mk>
diff --git a/net/akhq/files/akhq.in b/net/akhq/files/akhq.in
index d13c742faf56..1e3feedeae28 100644
--- a/net/akhq/files/akhq.in
+++ b/net/akhq/files/akhq.in
@@ -12,8 +12,8 @@ rcvar=akhq_enable
 load_rc_config $name
 
 : ${akhq_enable:=NO}
-: ${akhq_config:=%%LOCALBASE%%/etc/akhq/application.yml}
-: ${akhq_jar:=%%LOCALBASE%%/share/java/akhq/akhq.jar}
+: ${akhq_config:=%%PREFIX%%/etc/akhq/application.yml}
+: ${akhq_jar:=%%PREFIX%%/share/java/akhq/akhq.jar}
 : ${akhq_java:=%%LOCALBASE%%/bin/java}
 : ${akhq_user:=%%WWWOWN%%}
 : ${akhq_pidfile:=/var/run/${name}.pid}