diff --git a/misc/achievo/Makefile b/misc/achievo/Makefile
index 5b373323ffec..b07f57c88b9d 100644
--- a/misc/achievo/Makefile
+++ b/misc/achievo/Makefile
@@ -19,16 +19,13 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	YES
 
 ACHVODIR?=	www/achievo
-PLIST_SUB=	ACHVODIR=${ACHVODIR}
+PLIST_SUB=	ACHVODIR=${ACHVODIR} WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 
-NO_STAGE=	yes
 post-patch:
 	@${MV} ${WRKSRC}/config.inc.php ${WRKSRC}/config.inc.php-default
 
 do-install:
-	@${MKDIR} ${PREFIX}/${ACHVODIR}
-	@${CP} -R ${WRKSRC}/* ${PREFIX}/${ACHVODIR}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/${ACHVODIR}
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${ACHVODIR}
+	@${CP} -R ${WRKSRC}/* ${STAGEDIR}${PREFIX}/${ACHVODIR}
 
 .include <bsd.port.mk>
diff --git a/misc/achievo/pkg-plist b/misc/achievo/pkg-plist
index 91f442142e36..9f53fd354b51 100644
--- a/misc/achievo/pkg-plist
+++ b/misc/achievo/pkg-plist
@@ -1,3 +1,5 @@
+@owner %%WWWOWN%%
+@group %%WWWGRP%%
 %%ACHVODIR%%/README
 %%ACHVODIR%%/achievotools.inc
 %%ACHVODIR%%/atk.inc
@@ -471,6 +473,8 @@
 %%ACHVODIR%%/upgrade/convert-0.9-to-0.9.1.inc
 %%ACHVODIR%%/upgrade/convert-0.9.1-to-0.9.2.inc
 %%ACHVODIR%%/version.inc
+@owner
+@group
 @dirrm %%ACHVODIR%%/upgrade
 @dirrm %%ACHVODIR%%/themes/achievo_classic/images
 @dirrm %%ACHVODIR%%/themes/achievo_classic