Index: Makefile
===================================================================
--- Makefile	(revision 433537)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tomcat
-PORTVERSION=	8.0.39
+PORTVERSION=	8.0.41
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/tomcat/tomcat-8/v${PORTVERSION}/bin
 PKGNAMESUFFIX=	8
@@ -28,7 +28,8 @@
 TOMCAT_HOME=	${PREFIX}/${TOMCAT_SUBDIR}
 TOMCAT_CONF_FILES=	\
 		catalina.policy catalina.properties context.xml logging.properties \
-		 server.xml tomcat-users.xml tomcat-users.xsd web.xml
+		 server.xml tomcat-users.xml tomcat-users.xsd web.xml \
+		 ../webapps/ROOT/WEB-INF/web.xml
 PLIST_SUB=	T=${TOMCAT_SUBDIR} \
 		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
Index: distinfo
===================================================================
--- distinfo	(revision 433537)
+++ distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479347600
-SHA256 (apache-tomcat-8.0.39.tar.gz) = 4093aa19f70ebb2749d40fa81486971c1dc7f275da188f1436c62faedaf51e9a
-SIZE (apache-tomcat-8.0.39.tar.gz) = 9304967
+TIMESTAMP = 1486493626
+SHA256 (apache-tomcat-8.0.41.tar.gz) = a57204b5434755b5767299bbcd32e3afd2d6327cafa6b8372077f824aa7176d7
+SIZE (apache-tomcat-8.0.41.tar.gz) = 9254743
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 433537)
+++ pkg-plist	(working copy)
@@ -61,15 +61,13 @@
 %%T%%/temp/safeToDelete.tmp
 @dir %%T%%/temp
 %%T%%/webapps/ROOT/RELEASE-NOTES.txt
-%%T%%/webapps/ROOT/WEB-INF/web.xml
-%%T%%/webapps/ROOT/asf-logo-wide.gif
-%%T%%/webapps/ROOT/asf-logo.png
+%%T%%/webapps/ROOT/WEB-INF/web.xml.sample
+%%T%%/webapps/ROOT/asf-logo-wide.svg
 %%T%%/webapps/ROOT/bg-button.png
 %%T%%/webapps/ROOT/bg-middle.png
 %%T%%/webapps/ROOT/bg-nav-item.png
 %%T%%/webapps/ROOT/bg-nav.png
 %%T%%/webapps/ROOT/bg-upper.png
-%%T%%/webapps/ROOT/build.xml
 %%T%%/webapps/ROOT/favicon.ico
 %%T%%/webapps/ROOT/index.jsp
 %%T%%/webapps/ROOT/tomcat-power.gif
@@ -167,8 +165,7 @@
 %%T%%/webapps/docs/funcspecs/mbean-names.html
 %%T%%/webapps/docs/html-manager-howto.html
 %%T%%/webapps/docs/images/add.gif
-%%T%%/webapps/docs/images/asf-feather.png
-%%T%%/webapps/docs/images/asf-logo.gif
+%%T%%/webapps/docs/images/asf-logo.svg
 %%T%%/webapps/docs/images/code.gif
 %%T%%/webapps/docs/images/cors-flowchart.png
 %%T%%/webapps/docs/images/design.gif
@@ -611,7 +608,7 @@
 %%T%%/webapps/host-manager/WEB-INF/jsp/404.jsp
 %%T%%/webapps/host-manager/WEB-INF/web.xml
 %%T%%/webapps/host-manager/images/add.gif
-%%T%%/webapps/host-manager/images/asf-logo.gif
+%%T%%/webapps/host-manager/images/asf-logo.svg
 %%T%%/webapps/host-manager/images/code.gif
 %%T%%/webapps/host-manager/images/design.gif
 %%T%%/webapps/host-manager/images/docs.gif
@@ -630,7 +627,7 @@
 %%T%%/webapps/manager/WEB-INF/jsp/sessionsList.jsp
 %%T%%/webapps/manager/WEB-INF/web.xml
 %%T%%/webapps/manager/images/add.gif
-%%T%%/webapps/manager/images/asf-logo.gif
+%%T%%/webapps/manager/images/asf-logo.svg
 %%T%%/webapps/manager/images/code.gif
 %%T%%/webapps/manager/images/design.gif
 %%T%%/webapps/manager/images/docs.gif