diff -ur www/tomcat85.orig/Makefile www/tomcat85/Makefile
--- www/tomcat85.orig/Makefile
+++ www/tomcat85/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD: head/www/tomcat85/Makefile 552403 2020-10-15 10:56:31Z joneum $
 
 PORTNAME=	tomcat
-PORTVERSION=	8.5.59
+PORTVERSION=	8.5.60
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
 PKGNAMESUFFIX=	85
@@ -59,7 +59,7 @@
 
 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; do \
+		for f in host-manager/META-INF/context.xml host-manager/WEB-INF/manager.xml host-manager/WEB-INF/web.xml; do \
 			${MV} $$f $$f.sample; done)
 
 post-install-MANAGER-on:
diff -ur www/tomcat85.orig/distinfo www/tomcat85/distinfo
--- www/tomcat85.orig/distinfo
+++ www/tomcat85/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1602758648
-SHA256 (apache-tomcat-8.5.59.tar.gz) = 0c0debbf6c63361f31a914cf11dade006030832e7933c8fd483aa1ebcf032210
-SIZE (apache-tomcat-8.5.59.tar.gz) = 10432020
+TIMESTAMP = 1605710609
+SHA256 (apache-tomcat-8.5.60.tar.gz) = c473bd48f121ead24b079c7e33ca43fa6e3b42aa475cb1f359984541138d7e94
+SIZE (apache-tomcat-8.5.60.tar.gz) = 10488933
diff -ur www/tomcat85.orig/pkg-plist www/tomcat85/pkg-plist
--- www/tomcat85.orig/pkg-plist
+++ www/tomcat85/pkg-plist
@@ -207,6 +207,7 @@
 %%DOCS%%%%T%%/webapps/docs/websocketapi/index.html
 %%DOCS%%%%T%%/webapps/docs/windows-auth-howto.html
 %%DOCS%%%%T%%/webapps/docs/windows-service-howto.html
+%%EXAMPLES%%%%T%%/webapps/examples/META-INF/context.xml
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/CookieExample.class
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/CookieExample.java
 %%EXAMPLES%%%%T%%/webapps/examples/WEB-INF/classes/HelloWorldExample.class
@@ -586,11 +587,12 @@
 %%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
+%%HOST_MANAGER%%@sample %%T%%/webapps/host-manager/WEB-INF/manager.xml.sample
 %%HOST_MANAGER%%@sample %%T%%/webapps/host-manager/WEB-INF/web.xml.sample
+%%HOST_MANAGER%%%%T%%/webapps/host-manager/css/manager.css
 %%HOST_MANAGER%%%%T%%/webapps/host-manager/images/asf-logo.svg
-%%HOST_MANAGER%%%%T%%/webapps/host-manager/images/tomcat.gif
+%%HOST_MANAGER%%%%T%%/webapps/host-manager/images/tomcat.svg
 %%HOST_MANAGER%%%%T%%/webapps/host-manager/index.jsp
-%%HOST_MANAGER%%%%T%%/webapps/host-manager/manager.xml
 %%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
@@ -616,8 +618,5 @@
 %%ROOT%%%%T%%/webapps/ROOT/bg-upper.png
 %%ROOT%%%%T%%/webapps/ROOT/favicon.ico
 %%ROOT%%%%T%%/webapps/ROOT/index.jsp
-%%ROOT%%%%T%%/webapps/ROOT/tomcat-power.gif
 %%ROOT%%%%T%%/webapps/ROOT/tomcat.css
-%%ROOT%%%%T%%/webapps/ROOT/tomcat.gif
-%%ROOT%%%%T%%/webapps/ROOT/tomcat.png
 %%ROOT%%%%T%%/webapps/ROOT/tomcat.svg