diff --git a/www/jspwiki/Makefile b/www/jspwiki/Makefile
index 02a833ec207b..593d0bd2d510 100644
--- a/www/jspwiki/Makefile
+++ b/www/jspwiki/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jspwiki
 PORTVERSION=	2.8.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www java
 MASTER_SITES=	http://www.ecyrd.com/~jalkanen/JSPWiki/${PORTVERSION}/
 DISTNAME=	JSPWiki-${PORTVERSION}-bin
@@ -26,25 +26,20 @@ PORTDOCS=	ChangeLog README ReleaseNotes JSPWiki-*.zip
 
 PLIST_SUB=	TOMCATDIR=${TOMCATDIR:S|^${PREFIX}/||}
 
+OPTIONS_DEFINE=	DOCS
 OPTIONS_SINGLE=	AS
 OPTIONS_SINGLE_AS=	TOMCAT6 TOMCAT7
 OPTIONS_DEFAULT=	TOMCAT6
 
-NO_STAGE=	yes
-
-OPTIONS_DEFINE=	DOCS
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTOMCAT6}
 TOMCATVER=	apache-tomcat-6.0
-BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
 RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat6
 .endif
 
 .if ${PORT_OPTIONS:MTOMCAT7}
 TOMCATVER=	apache-tomcat-7.0
-BUILD_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
 RUN_DEPENDS+=	${APPHOME}/bin/bootstrap.jar:${PORTSDIR}/www/tomcat7
 .endif
 
@@ -53,25 +48,14 @@ post-extract:
 	@${MKDIR} ${WRKDIR}/${WEBAPP}
 	@${TAR} xf ${WRKDIR}/${PORTNAME}/JSPWiki.war -C ${WRKDIR}/${WEBAPP}
 .for file in jspwiki.policy jspwiki.properties web.xml
-	@${MV} ${WRKDIR}/${WEBAPP}/WEB-INF/${file} ${WRKDIR}/${WEBAPP}/WEB-INF/${file}.example
+	@${MV} ${WRKDIR}/${WEBAPP}/WEB-INF/${file} ${WRKDIR}/${WEBAPP}/WEB-INF/${file}.sample
 .endfor
 
 do-install:
-	${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} ${WEBAPPDIR}/${WEBAPP}
-	@(cd ${WRKDIR}/${WEBAPP} && ${COPYTREE_SHARE} \* ${WEBAPPDIR}/${WEBAPP})
-	@for file in jspwiki.policy jspwiki.properties web.xml ; do \
-		if [ ! -e "${WEBAPPDIR}/${WEBAPP}/WEB-INF/$$file}" ]; then \
-			${ECHO_MSG} "	Installing local configuration file: ${WEBAPPDIR}/${WEBAPP}/WEB-INF/$$file"; \
-			${CP} ${WEBAPPDIR}/${WEBAPP}/WEB-INF/$${file}.example ${WEBAPPDIR}/${WEBAPP}/WEB-INF/$$file; \
-				else \
-					${ECHO_MSG} "	Preserving local configuration file: ${WEBAPPDIR}/${WEBAPP}/WEB-INF/$$file"; \
-		fi; \
-	done
+	@${MKDIR} ${STAGEDIR}${WEBAPPDIR}/${WEBAPP}
+	(cd ${WRKDIR}/${WEBAPP} && ${COPYTREE_SHARE} . ${STAGEDIR}${WEBAPPDIR}/${WEBAPP})
 
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/${PORTNAME}/|} ${DOCSDIR}
-.endif
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKDIR}/${PORTNAME}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/www/jspwiki/pkg-plist b/www/jspwiki/pkg-plist
index 4c2b614f0dba..b8231ea12f86 100644
--- a/www/jspwiki/pkg-plist
+++ b/www/jspwiki/pkg-plist
@@ -1,6 +1,5 @@
-@unexec if cmp -s %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.properties %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.properties.example; then rm -f %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.properties; else echo If permanently deleting this package, %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.properties must be removed manually; fi
-@unexec if cmp -s %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.policy %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.policy.example; then rm -f %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.policy; else echo If permanently deleting this package, %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.policy must be removed manually; fi
-@unexec if cmp -s %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/web.xml %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/web.xml.example; then rm -f %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/web.xml; else echo If permanently deleting this package, %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/web.xml must be removed manually; fi
+@owner www
+@group www
 %%TOMCATDIR%%/webapps/JSPWiki/Captcha.jsp
 %%TOMCATDIR%%/webapps/JSPWiki/Comment.jsp
 %%TOMCATDIR%%/webapps/JSPWiki/CookieError.jsp
@@ -32,10 +31,8 @@
 %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/dtd/web-app_2_3.dtd
 %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/geronimo-web.xml
 %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/groupdatabase.xml
-%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.policy.example
-@exec if [ ! -f %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.policy ]; then cp %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.policy.example %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.policy; fi
-%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.properties.example
-@exec if [ ! -f %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.properties ]; then cp %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.properties.example %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.properties; fi
+@sample %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.policy.sample
+@sample %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.properties.sample
 %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jspwiki.tld
 %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/jstl-fmt.tld
 %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/lib/JSPWiki.jar
@@ -67,8 +64,7 @@
 %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/lib/xmlrpc.jar
 %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/oscache.tld
 %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/userdatabase.xml
-%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/web.xml.example
-@exec if [ ! -f %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/web.xml ]; then cp %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/web.xml.example %D/%%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/web.xml; fi
+@sample %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/web.xml.sample
 %%TOMCATDIR%%/webapps/JSPWiki/Wiki.jsp
 %%TOMCATDIR%%/webapps/JSPWiki/Workflow.jsp
 %%TOMCATDIR%%/webapps/JSPWiki/admin/Admin.jsp
@@ -213,28 +209,31 @@
 %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/Smart/skin.css
 %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/Smart/skin.js
 %%TOMCATDIR%%/webapps/JSPWiki/templates/raw/ViewTemplate.jsp
-@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/raw
-@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/Smart/images
-@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/Smart
-@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/PlainVanilla 1024x768
-@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/PlainVanilla
-@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/OrderedList/images
-@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/OrderedList
-@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins
-@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/images
-@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/editors
-@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/admin
-@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default
-@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates
+@dirrm %%TOMCATDIR%%/webapps/JSPWiki/META-INF
+@dirrm %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/classes
+@dirrm %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/dtd
+@dirrm %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/lib
+@dirrmtry %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF
+@dirrm %%TOMCATDIR%%/webapps/JSPWiki/admin
+@dirrm %%TOMCATDIR%%/webapps/JSPWiki/applets
+@dirrm %%TOMCATDIR%%/webapps/JSPWiki/error
+@dirrm %%TOMCATDIR%%/webapps/JSPWiki/images
 @dirrm %%TOMCATDIR%%/webapps/JSPWiki/scripts/fckeditor
 @dirrm %%TOMCATDIR%%/webapps/JSPWiki/scripts
-@dirrm %%TOMCATDIR%%/webapps/JSPWiki/images
-@dirrm %%TOMCATDIR%%/webapps/JSPWiki/error
-@dirrm %%TOMCATDIR%%/webapps/JSPWiki/applets
-@dirrm %%TOMCATDIR%%/webapps/JSPWiki/admin
-@dirrm %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/lib
-@dirrm %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/dtd
-@dirrm %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF/classes
-@dirrm %%TOMCATDIR%%/webapps/JSPWiki/WEB-INF
-@dirrm %%TOMCATDIR%%/webapps/JSPWiki/META-INF
-@dirrm %%TOMCATDIR%%/webapps/JSPWiki
+@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/admin
+@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/editors
+@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/images
+@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/OrderedList/images
+@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/OrderedList
+@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/PlainVanilla
+@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/PlainVanilla 1024x768
+@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/Smart/images
+@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins/Smart
+@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default/skins
+@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/default
+@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates/raw
+@dirrm %%TOMCATDIR%%/webapps/JSPWiki/templates
+@dirrmtry %%TOMCATDIR%%/webapps/JSPWiki
+@comment reset owner for docs and examples
+@owner root
+@group wheel