diff -urN tomcat6.orig/Makefile tomcat6/Makefile
--- tomcat6.orig/Makefile	2008-06-06 07:07:15.000000000 -0700
+++ tomcat6/Makefile	2008-06-13 14:02:16.000000000 -0700
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	apache-tomcat
-PORTVERSION=	6.0.14
-PORTREVISION=	1
+PORTVERSION=	6.0.16
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	tomcat/tomcat-6/v${PORTVERSION}/bin
diff -urN tomcat6.orig/distinfo tomcat6/distinfo
--- tomcat6.orig/distinfo	2007-08-20 20:39:05.000000000 -0700
+++ tomcat6/distinfo	2008-06-13 14:06:00.000000000 -0700
@@ -1,3 +1,3 @@
-MD5 (apache-tomcat-6.0.14.tar.gz) = 3b18ff250d8172737c4f67f11631f68a
-SHA256 (apache-tomcat-6.0.14.tar.gz) = 04535ff829131883f5aaf3c9c07124bc05b286253735fe085b9bb4a2c7e55122
-SIZE (apache-tomcat-6.0.14.tar.gz) = 5986411
+MD5 (apache-tomcat-6.0.16.tar.gz) = 4985fed02341a9e04ea43e91e6444ace
+SHA256 (apache-tomcat-6.0.16.tar.gz) = eb6de12a8e8ef02ea9844155579863553ff9ea0417b781324c2b8c913a455c65
+SIZE (apache-tomcat-6.0.16.tar.gz) = 6153560
diff -urN tomcat6.orig/pkg-plist tomcat6/pkg-plist
--- tomcat6.orig/pkg-plist	2007-08-20 20:39:05.000000000 -0700
+++ tomcat6/pkg-plist	2008-06-13 14:15:50.000000000 -0700
@@ -91,6 +91,7 @@
 %%T%%/webapps/docs/appdev/sample/src/mypackage/Hello.java
 %%T%%/webapps/docs/appdev/sample/web/WEB-INF/web.xml
 %%T%%/webapps/docs/appdev/sample/web/hello.jsp
+%%T%%/webapps/docs/appdev/sample/web/images/Thumbs.db
 %%T%%/webapps/docs/appdev/sample/web/images/tomcat.gif
 %%T%%/webapps/docs/appdev/sample/web/index.html
 %%T%%/webapps/docs/appdev/source.html
@@ -188,6 +189,7 @@
 %%T%%/webapps/docs/funcspecs/printer/index.html
 %%T%%/webapps/docs/funcspecs/printer/mbean-names.html
 %%T%%/webapps/docs/html-manager-howto.html
+%%T%%/webapps/docs/images/Thumbs.db
 %%T%%/webapps/docs/images/add.gif
 %%T%%/webapps/docs/images/asf-logo.gif
 %%T%%/webapps/docs/images/code.gif
@@ -545,6 +547,7 @@
 %%T%%/webapps/host-manager/META-INF/context.xml
 %%T%%/webapps/host-manager/WEB-INF/web.xml
 %%T%%/webapps/host-manager/manager.xml
+%%T%%/webapps/host-manager/images/Thumbs.db
 %%T%%/webapps/host-manager/images/add.gif
 %%T%%/webapps/host-manager/images/asf-logo.gif
 %%T%%/webapps/host-manager/images/code.gif
@@ -640,7 +643,6 @@
 @dirrm %%T%%/webapps/docs/images
 @dirrm %%T%%/webapps/docs/funcspecs/printer
 @dirrm %%T%%/webapps/docs/funcspecs
-@dirrm %%T%%/webapps/docs/funcspec
 @dirrm %%T%%/webapps/docs/config/printer
 @dirrm %%T%%/webapps/docs/config
 @dirrm %%T%%/webapps/docs/architecture/startup