diff --git a/net/akhq/Makefile b/net/akhq/Makefile
index d47e58a..68af3e8 100644
--- a/net/akhq/Makefile
+++ b/net/akhq/Makefile
@@ -1,13 +1,12 @@
 PORTNAME=	akhq
 DISTVERSION=	0.25.1
 DISTVERSIONSUFFIX= -all
-PORTREVISION=	1
 CATEGORIES=	net java
 MASTER_SITES=	https://github.com/tchiotludo/akhq/releases/download/${PORTVERSION}/
 EXTRACT_SUFX=	.jar
 
 MAINTAINER=	freebsd@hackacad.net
-COMMENT=	AKHQ (previously known as KafkaHQ)
+COMMENT=	Kafka Gui for Apache Kafka
 WWW=		https://github.com/tchiotludo/akhq
 
 LICENSE=	APACHE20
@@ -19,22 +18,18 @@ USE_RC_SUBR=	akhq
 NO_ARCH=	yes
 NO_BUILD=	yes
 
-PLIST_FILES=	${JAVASHAREDIR}/${PORTNAME}/${PORTNAME}.jar
+PLIST_FILES=	"@sample ${ETCDIR}/application.yml.sample" \
+		${JAVASHAREDIR}/${PORTNAME}/${PORTNAME}.jar 
 
 CONFIG_FILES=	application.yml
 
 NO_EXTRACT=	yes
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/akhq
+	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}
 	${INSTALL_DATA} ${DISTDIR}/${DISTFILES} ${STAGEDIR}${JAVASHAREDIR}/${PORTNAME}/${PORTNAME}.jar
-	${INSTALL_DATA} ${FILESDIR}/application.yml ${STAGEDIR}${PREFIX}/etc/akhq/application.yml.sample
-	${ECHO} "@sample ${PREFIX}/etc/akhq/application.yml.sample" >> ${TMPPLIST}
-
-post-install:
-	@if [ ! -f ${STAGEDIR}${PREFIX}/etc/akhq/application.yml ]; then \
-		${CP} -p ${STAGEDIR}${PREFIX}/etc/akhq/application.yml.sample ${STAGEDIR}${PREFIX}/etc/akhq/application.yml ; \
-	fi
+	${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 d6556c5..d13c742 100644
--- a/net/akhq/files/akhq.in
+++ b/net/akhq/files/akhq.in
@@ -15,7 +15,7 @@ load_rc_config $name
 : ${akhq_config:=%%LOCALBASE%%/etc/akhq/application.yml}
 : ${akhq_jar:=%%LOCALBASE%%/share/java/akhq/akhq.jar}
 : ${akhq_java:=%%LOCALBASE%%/bin/java}
-: ${akhq_user:=www}
+: ${akhq_user:=%%WWWOWN%%}
 : ${akhq_pidfile:=/var/run/${name}.pid}
 
 command="/usr/sbin/daemon"
diff --git a/net/akhq/files/application.yml b/net/akhq/files/application.yml
index d80404d..be61195 100644
--- a/net/akhq/files/application.yml
+++ b/net/akhq/files/application.yml
@@ -6,4 +6,4 @@ akhq:
 micronaut:
   server:
     port: 8080
-    host: "0.0.0.0"
+    host: "127.0.0.1"