diff --git a/www/yourls/Makefile b/www/yourls/Makefile
index f1b0a646d5ea..49e51149c048 100644
--- a/www/yourls/Makefile
+++ b/www/yourls/Makefile
@@ -21,19 +21,10 @@ USE_PHP=	bcmath curl json mysql pcre xml
 
 SUB_LIST+=	PKGNAME=${PKGNAME}
 SUB_FILES+=	pkg-message
-
-.include <bsd.port.pre.mk>
+PLIST_SUB=	WWWOWN=${WWWOWN} \
+		WWWGRP=${WWWGRP}
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
-	@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
-	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \
-		${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST}
-	@${FIND} ${STAGEDIR}${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644
-	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type f -print0 | \
-		${XARGS} -0 ${CHMOD} 644' >> ${TMPPLIST}
-	@${FIND} ${STAGEDIR}${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755
-	@${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type d -print0 | \
-		${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/yourls/pkg-plist b/www/yourls/pkg-plist
index 46cb6479e63d..fe56e2e0f158 100644
--- a/www/yourls/pkg-plist
+++ b/www/yourls/pkg-plist
@@ -1,3 +1,5 @@
+@owner %%WWWOWN%%
+@group %%WWWGRP%%
 %%WWWDIR%%/admin/admin-ajax.php
 %%WWWDIR%%/admin/index.php
 %%WWWDIR%%/admin/install.php
@@ -365,23 +367,25 @@
 %%WWWDIR%%/yourls-go.php
 %%WWWDIR%%/yourls-infos.php
 %%WWWDIR%%/yourls-loader.php
-@dirrm %%WWWDIR%%/user/plugins/sample-toolbar/js
-@dirrm %%WWWDIR%%/user/plugins/sample-toolbar/img
-@dirrm %%WWWDIR%%/user/plugins/sample-toolbar/css
-@dirrm %%WWWDIR%%/user/plugins/sample-toolbar
-@dirrm %%WWWDIR%%/user/plugins/sample-plugin
-@dirrm %%WWWDIR%%/user/plugins/sample-page
-@dirrm %%WWWDIR%%/user/plugins/random-bg/img
-@dirrm %%WWWDIR%%/user/plugins/random-bg
-@dirrm %%WWWDIR%%/user/plugins/hyphens-in-urls
-@dirrm %%WWWDIR%%/user/plugins
-@dirrm %%WWWDIR%%/user
-@dirrm %%WWWDIR%%/pages
-@dirrm %%WWWDIR%%/js
+@dirrm %%WWWDIR%%/admin
+@dirrm %%WWWDIR%%/css
+@dirrm %%WWWDIR%%/images
 @dirrm %%WWWDIR%%/includes/geo/flags
 @dirrm %%WWWDIR%%/includes/geo
 @dirrm %%WWWDIR%%/includes
-@dirrm %%WWWDIR%%/images
-@dirrm %%WWWDIR%%/css
-@dirrm %%WWWDIR%%/admin
+@dirrm %%WWWDIR%%/js
+@dirrm %%WWWDIR%%/pages
+@dirrm %%WWWDIR%%/user/plugins/hyphens-in-urls
+@dirrm %%WWWDIR%%/user/plugins/random-bg/img
+@dirrm %%WWWDIR%%/user/plugins/random-bg
+@dirrm %%WWWDIR%%/user/plugins/sample-page
+@dirrm %%WWWDIR%%/user/plugins/sample-plugin
+@dirrm %%WWWDIR%%/user/plugins/sample-toolbar/css
+@dirrm %%WWWDIR%%/user/plugins/sample-toolbar/img
+@dirrm %%WWWDIR%%/user/plugins/sample-toolbar/js
+@dirrm %%WWWDIR%%/user/plugins/sample-toolbar
+@dirrm %%WWWDIR%%/user/plugins
+@dirrm %%WWWDIR%%/user
 @dirrm %%WWWDIR%%
+@owner root
+@group wheel