diff --git a/www/limesurvey/Makefile b/www/limesurvey/Makefile
index dfe82ab02055..66c6bbf0f48d 100644
--- a/www/limesurvey/Makefile
+++ b/www/limesurvey/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	limesurvey
 PORTVERSION=	1.91
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/1._LimeSurvey_stable/${PORTVERSION}+/
 DISTNAME=	${PORTNAME}${PORTVERSION:S^.^^}plus-build10232-20110608
@@ -70,20 +71,23 @@ do-install:
 .endif
 	@cd "${WRKSRC}" && ${COPYTREE_SHARE} . "${STAGEDIR}${WWWDIR}"
 	${MKDIR} "${STAGEDIR}${WWWDIR}"/tmp
-	${CHOWN} -R "${WWWOWN}:${WWWGRP}" "${STAGEDIR}${WWWDIR}"
 	${CHMOD} 755 "${STAGEDIR}${WWWDIR}"/tmp
 	${CHMOD} 755 "${STAGEDIR}${WWWDIR}"/templates
 	${CHMOD} 755 "${STAGEDIR}${WWWDIR}"/upload
-	${CHOWN} -R 0 "${STAGEDIR}${WWWDIR}"/admin
 	${CHMOD} -R go-w "${STAGEDIR}${WWWDIR}"/admin
 
 post-install:
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD} "@owner www" >> ${TMPPLIST}
-	@${ECHO_CMD} "@group www" >> ${TMPPLIST}
-	@${FIND} -s -d ${STAGEDIR}${WWWDIR} -type f -print | \
+	@${ECHO_CMD} "@group ${WWWGRP}" >> ${TMPPLIST}
+	@${FIND} -s -d ${STAGEDIR}${WWWDIR}/admin -type f -print | \
 		${SED} -e "s#${STAGEDIR}${PREFIX}/##g" >> ${TMPPLIST}
-	@${FIND} -s -d ${STAGEDIR}${WWWDIR} -type d  -print | \
-		${SED} -E -e "s#${STAGEDIR}${PREFIX}/#@dirrm #g" >> ${TMPPLIST}
+	@${FIND} -s -d ${STAGEDIR}${WWWDIR}/admin -type d -print | \
+		${SED} -E -e "s#${STAGEDIR}${PREFIX}/#@dir #g" >> ${TMPPLIST}
+	@${ECHO_CMD} "@owner ${WWWOWN}" >> ${TMPPLIST}
+	@${FIND} -s -d ${STAGEDIR}${WWWDIR} ! -path "${STAGEDIR}${WWWDIR}/admin/*" -type f -print | \
+		${SED} -e "s#${STAGEDIR}${PREFIX}/##g" >> ${TMPPLIST}
+	@${FIND} -s -d ${STAGEDIR}${WWWDIR} -type d ! -path "${STAGEDIR}${WWWDIR}/admin*" -print | \
+		${SED} -E -e "s#${STAGEDIR}${PREFIX}/#@dir #g" >> ${TMPPLIST}
+	@${ECHO_CMD} "@owner" >> ${TMPPLIST}
+	@${ECHO_CMD} "@group" >> ${TMPPLIST}
 
 .include <bsd.port.mk>