diff --git a/devel/cdash/Makefile b/devel/cdash/Makefile
index b4024ef7d291..0d404065af05 100644
--- a/devel/cdash/Makefile
+++ b/devel/cdash/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cdash
 PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cdash.org/download/
 DISTNAME=	CDash-${PORTVERSION}
@@ -24,6 +24,7 @@ CMAKE_ARGS+=	-DCDASH_DB_NAME:STRING=cdash \
 USE_PHP=	curl gd xsl
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/./-/g}
+PLIST_SUB=	WWWOWN="${WWWOWN}"
 SUB_FILES=	pkg-message
 SUB_LIST+=	DB_TYPE=${DB_TYPE}
 
@@ -45,11 +46,5 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/CDash
 	${RM} -f ${WRKSRC}/CMakeLists.txt.orig
 	cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/www/CDash
-	${CHOWN} www ${STAGEDIR}${PREFIX}/www/CDash/backup ${STAGEDIR}${PREFIX}/www/CDash/rss
-
-post-install:
-	@${ECHO}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO}
 
 .include <bsd.port.mk>
diff --git a/devel/cdash/pkg-plist b/devel/cdash/pkg-plist
index 3e298d23d2ad..b45aeaeca92e 100644
--- a/devel/cdash/pkg-plist
+++ b/devel/cdash/pkg-plist
@@ -871,7 +871,7 @@ www/CDash/xml_handlers/upload_handler.php
 @dirrm www/CDash/sql/mysql
 @dirrm www/CDash/sql
 @dirrm www/CDash/scripts
-@dirrm www/CDash/rss
+@dirrm(%%WWWOWN%%,,) www/CDash/rss
 @dirrm www/CDash/models
 @dirrm www/CDash/local
 @dirrm www/CDash/javascript/images
@@ -879,7 +879,7 @@ www/CDash/xml_handlers/upload_handler.php
 @dirrm www/CDash/iphone
 @dirrm www/CDash/images
 @dirrm www/CDash/cdash
-@dirrm www/CDash/backup
+@dirrm(%%WWWOWN%%,,) www/CDash/backup
 @dirrm www/CDash/api
 @dirrm www/CDash/ajax
 @dirrm www/CDash