diff -ur www/tomcat9.orig/Makefile www/tomcat9/Makefile
--- www/tomcat9.orig/Makefile
+++ www/tomcat9/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD: head/www/tomcat9/Makefile 552404 2020-10-15 10:57:29Z joneum $
 
 PORTNAME=	tomcat
-PORTVERSION=	9.0.39
+PORTVERSION=	9.0.40
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
 PKGNAMESUFFIX=	9
@@ -60,7 +60,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/tomcat9.orig/distinfo www/tomcat9/distinfo
--- www/tomcat9.orig/distinfo
+++ www/tomcat9/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1602758706
-SHA256 (apache-tomcat-9.0.39.tar.gz) = 6f7283ffda9a6b836030db6d818b095a138a91ffb8d26a341a83ddc54ea18835
-SIZE (apache-tomcat-9.0.39.tar.gz) = 11282879
+TIMESTAMP = 1605711680
+SHA256 (apache-tomcat-9.0.40.tar.gz) = bb52b10b500f113dc4b504e34f4ac0a5f48f31d93ea261c721459a4b7e72ca52
+SIZE (apache-tomcat-9.0.40.tar.gz) = 11437266
diff -ur www/tomcat9.orig/pkg-plist www/tomcat9/pkg-plist
--- www/tomcat9.orig/pkg-plist
+++ www/tomcat9/pkg-plist
@@ -26,7 +26,7 @@
 %%T%%/lib/catalina-storeconfig.jar
 %%T%%/lib/catalina-tribes.jar
 %%T%%/lib/catalina.jar
-%%T%%/lib/ecj-4.15.jar
+%%T%%/lib/ecj-4.17.jar
 %%T%%/lib/el-api.jar
 %%T%%/lib/jasper-el.jar
 %%T%%/lib/jasper.jar
@@ -212,6 +212,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
@@ -599,11 +600,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
@@ -629,8 +631,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