diff -ur www/tomcat85.orig/Makefile www/tomcat85/Makefile
--- www/tomcat85.orig/Makefile
+++ www/tomcat85/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tomcat
 PORTVERSION=	8.5.30
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
 PKGNAMESUFFIX=	85
@@ -53,14 +53,20 @@
 	@${RM} ${STAGEDIR}${TOMCAT_HOME}/bin/*.bat
 	(cd ${STAGEDIR}${TOMCAT_HOME}/conf &&\
 		for f in $$(find . -type f); do ${MV} $$f $$f.sample; done)
+
+post-install-HOST_MANAGER-on:
 	(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
-		for f in host-manager/META-INF/context.xml host-manager/WEB-INF/web.xml \
-			manager/META-INF/context.xml manager/WEB-INF/web.xml; do \
+		for f in host-manager/META-INF/context.xml host-manager/WEB-INF/web.xml; do \
 			${MV} $$f $$f.sample; done)
 
 post-install-HOST_MANAGER-off:
 	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/host-manager
 
+post-install-MANAGER-on:
+	(cd ${STAGEDIR}${TOMCAT_HOME}/webapps &&\
+		for f in manager/META-INF/context.xml manager/WEB-INF/web.xml; do \
+			${MV} $$f $$f.sample; done)
+
 post-install-MANAGER-off:
 	@${RM} -R ${STAGEDIR}${TOMCAT_HOME}/webapps/manager
 
diff -ur www/tomcat85.orig/pkg-plist www/tomcat85/pkg-plist
--- www/tomcat85.orig/pkg-plist
+++ www/tomcat85/pkg-plist
@@ -587,11 +587,11 @@
 %%EXAMPLES%%%%T%%/webapps/examples/websocket/echo.xhtml
 %%EXAMPLES%%%%T%%/webapps/examples/websocket/index.xhtml
 %%EXAMPLES%%%%T%%/webapps/examples/websocket/snake.xhtml
-@sample %%HOST_MANAGER%%%%T%%/webapps/host-manager/META-INF/context.xml.sample
+%%HOST_MANAGER%%@sample %%T%%/webapps/host-manager/META-INF/context.xml.sample
 %%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/jsp/401.jsp
 %%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/jsp/403.jsp
 %%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/jsp/404.jsp
-@sample %%HOST_MANAGER%%%%T%%/webapps/host-manager/WEB-INF/web.xml.sample
+%%HOST_MANAGER%%@sample %%T%%/webapps/host-manager/WEB-INF/web.xml.sample
 %%HOST_MANAGER%%%%T%%/webapps/host-manager/images/add.gif
 %%HOST_MANAGER%%%%T%%/webapps/host-manager/images/asf-logo.svg
 %%HOST_MANAGER%%%%T%%/webapps/host-manager/images/code.gif
@@ -603,7 +603,7 @@
 %%HOST_MANAGER%%%%T%%/webapps/host-manager/images/void.gif
 %%HOST_MANAGER%%%%T%%/webapps/host-manager/index.jsp
 %%HOST_MANAGER%%%%T%%/webapps/host-manager/manager.xml
-@sample %%MANAGER%%%%T%%/webapps/manager/META-INF/context.xml.sample
+%%MANAGER%%@sample %%T%%/webapps/manager/META-INF/context.xml.sample
 %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/401.jsp
 %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/403.jsp
 %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/404.jsp
@@ -612,7 +612,7 @@
 %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/connectorTrustedCerts.jsp
 %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/sessionDetail.jsp
 %%MANAGER%%%%T%%/webapps/manager/WEB-INF/jsp/sessionsList.jsp
-@sample %%MANAGER%%%%T%%/webapps/manager/WEB-INF/web.xml.sample
+%%MANAGER%%@sample %%T%%/webapps/manager/WEB-INF/web.xml.sample
 %%MANAGER%%%%T%%/webapps/manager/images/add.gif
 %%MANAGER%%%%T%%/webapps/manager/images/asf-logo.svg
 %%MANAGER%%%%T%%/webapps/manager/images/code.gif