diff --git a/www/tomcat/v6/Makefile b/www/tomcat/v6/Makefile
index 6e0686697c6..0eae7ff8b86 100644
--- a/www/tomcat/v6/Makefile
+++ b/www/tomcat/v6/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.36 2016/11/23 09:58:32 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.37 2017/03/23 18:35:29 dcoppa Exp $
 
 COMMENT-main =	Java servlet 2.5 and Java server pages 2.1 server
 
 MAJ_VER =	6
 MIN_VER =	0
-MICRO_VER =	48
+MICRO_VER =	51
 
 RUN_DEPENDS-examples =www/tomcat/v${MAJ_VER},-main>=${MAJ_VER},<7
 
diff --git a/www/tomcat/v6/distinfo b/www/tomcat/v6/distinfo
index 4ec8a106e8f..c04922e6166 100644
--- a/www/tomcat/v6/distinfo
+++ b/www/tomcat/v6/distinfo
@@ -1,4 +1,4 @@
-SHA256 (apache-tomcat-6.0.48-fulldocs.tar.gz) = byQ0M0d84piGksXUOyykaONZO2RopjMSUhooK5Mb4Zk=
-SHA256 (apache-tomcat-6.0.48.tar.gz) = bC2wZiDjbwiSHf6UvLPwT1EcBViG9yhjdUVc9JBwkvA=
-SIZE (apache-tomcat-6.0.48-fulldocs.tar.gz) = 3703872
-SIZE (apache-tomcat-6.0.48.tar.gz) = 7085510
+SHA256 (apache-tomcat-6.0.51-fulldocs.tar.gz) = 5V5w0X8KZIwmivuDeH8PhxSqvzgAwitMgVd3SgijfUQ=
+SHA256 (apache-tomcat-6.0.51.tar.gz) = j+iGIroJkRCl9rhYVq8mKlX3njFwBSX+DS6WFDOzprk=
+SIZE (apache-tomcat-6.0.51-fulldocs.tar.gz) = 3712355
+SIZE (apache-tomcat-6.0.51.tar.gz) = 7105938
diff --git a/www/tomcat/v6/patches/patch-conf_server_xml b/www/tomcat/v6/patches/patch-conf_server_xml
index d955a5fbcd8..dbed44e35a0 100644
--- a/www/tomcat/v6/patches/patch-conf_server_xml
+++ b/www/tomcat/v6/patches/patch-conf_server_xml
@@ -1,6 +1,6 @@
-$OpenBSD: patch-conf_server_xml,v 1.3 2011/10/17 11:11:46 dcoppa Exp $
---- conf/server.xml.orig	Wed Feb  2 20:06:47 2011
-+++ conf/server.xml	Wed Jun 22 11:03:34 2011
+$OpenBSD: patch-conf_server_xml,v 1.4 2017/03/23 18:35:30 dcoppa Exp $
+--- conf/server.xml.orig	Thu Mar  9 21:28:01 2017
++++ conf/server.xml	Thu Mar 23 17:57:29 2017
 @@ -66,12 +66,12 @@
           APR (HTTP/AJP) Connector: /docs/apr.html
           Define a non-SSL HTTP/1.1 Connector on port 8080
@@ -32,7 +32,7 @@ $OpenBSD: patch-conf_server_xml,v 1.3 2011/10/17 11:11:46 dcoppa Exp $
  
  
      <!-- An Engine represents the entry point (within Catalina) that processes
-@@ -125,7 +125,7 @@
+@@ -129,7 +129,7 @@
        <!-- Define the default virtual host
             Note: XML Schema validation will not work with Xerces 2.2.
         -->
diff --git a/www/tomcat/v6/pkg/PLIST-examples b/www/tomcat/v6/pkg/PLIST-examples
index d6f14f288c4..40e47d8f15c 100644
--- a/www/tomcat/v6/pkg/PLIST-examples
+++ b/www/tomcat/v6/pkg/PLIST-examples
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-examples,v 1.16 2016/11/23 09:58:32 dcoppa Exp $
+@comment $OpenBSD: PLIST-examples,v 1.17 2017/03/23 18:35:30 dcoppa Exp $
 @option is-branch
 @owner _tomcat
 @group _tomcat
@@ -6,8 +6,7 @@ webapps/ROOT/
 webapps/ROOT/RELEASE-NOTES.txt
 webapps/ROOT/WEB-INF/
 webapps/ROOT/WEB-INF/web.xml
-webapps/ROOT/asf-logo-wide.gif
-webapps/ROOT/build.xml
+webapps/ROOT/asf-logo-wide.svg
 webapps/ROOT/favicon.ico
 webapps/ROOT/index.html
 webapps/ROOT/index.jsp
@@ -982,6 +981,7 @@ webapps/docs/api/org/apache/jasper/package-tree.html
 webapps/docs/api/org/apache/jasper/runtime/
 webapps/docs/api/org/apache/jasper/runtime/AnnotationHelper.html
 webapps/docs/api/org/apache/jasper/runtime/BodyContentImpl.html
+webapps/docs/api/org/apache/jasper/runtime/ExceptionUtils.html
 webapps/docs/api/org/apache/jasper/runtime/HttpJspBase.html
 webapps/docs/api/org/apache/jasper/runtime/JspApplicationContextImpl.html
 webapps/docs/api/org/apache/jasper/runtime/JspContextWrapper.html
@@ -1490,6 +1490,7 @@ webapps/docs/api/org/apache/tomcat/util/net/SSLSupport.CipherData.html
 webapps/docs/api/org/apache/tomcat/util/net/SSLSupport.html
 webapps/docs/api/org/apache/tomcat/util/net/SecureNioChannel.ApplicationBufferHandler.html
 webapps/docs/api/org/apache/tomcat/util/net/SecureNioChannel.html
+webapps/docs/api/org/apache/tomcat/util/net/SendfileState.html
 webapps/docs/api/org/apache/tomcat/util/net/ServerSocketFactory.html
 webapps/docs/api/org/apache/tomcat/util/net/SocketProperties.html
 webapps/docs/api/org/apache/tomcat/util/net/SocketStatus.html
@@ -1632,13 +1633,14 @@ webapps/docs/funcspecs/mbean-names.html
 webapps/docs/html-manager-howto.html
 webapps/docs/images/
 webapps/docs/images/add.gif
-webapps/docs/images/asf-logo.gif
+webapps/docs/images/asf-logo.svg
 webapps/docs/images/code.gif
 webapps/docs/images/design.gif
 webapps/docs/images/docs.gif
 webapps/docs/images/fix.gif
 webapps/docs/images/printer.gif
 webapps/docs/images/tomcat.gif
+webapps/docs/images/tomcat.png
 webapps/docs/images/tomcat.svg
 webapps/docs/images/update.gif
 webapps/docs/images/void.gif
diff --git a/www/tomcat/v6/pkg/PLIST-main b/www/tomcat/v6/pkg/PLIST-main
index 650e9b8c0b2..b047865be07 100644
--- a/www/tomcat/v6/pkg/PLIST-main
+++ b/www/tomcat/v6/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.13 2016/06/29 16:14:44 espie Exp $
+@comment $OpenBSD: PLIST-main,v 1.14 2017/03/23 18:35:30 dcoppa Exp $
 @option is-branch
 @newgroup _tomcat:526
 @newuser _tomcat:526:_tomcat:daemon:Tomcat Account:/nonexistent:/sbin/nologin
@@ -114,7 +114,7 @@ tomcat/webapps/host-manager/WEB-INF/jsp/403.jsp
 tomcat/webapps/host-manager/WEB-INF/web.xml
 tomcat/webapps/host-manager/images/
 tomcat/webapps/host-manager/images/add.gif
-tomcat/webapps/host-manager/images/asf-logo.gif
+tomcat/webapps/host-manager/images/asf-logo.svg
 tomcat/webapps/host-manager/images/code.gif
 tomcat/webapps/host-manager/images/design.gif
 tomcat/webapps/host-manager/images/docs.gif
@@ -136,7 +136,7 @@ tomcat/webapps/manager/WEB-INF/jsp/sessionsList.jsp
 tomcat/webapps/manager/WEB-INF/web.xml
 tomcat/webapps/manager/images/
 tomcat/webapps/manager/images/add.gif
-tomcat/webapps/manager/images/asf-logo.gif
+tomcat/webapps/manager/images/asf-logo.svg
 tomcat/webapps/manager/images/code.gif
 tomcat/webapps/manager/images/design.gif
 tomcat/webapps/manager/images/docs.gif
diff --git a/www/tomcat/v7/Makefile b/www/tomcat/v7/Makefile
index cefa557f044..bbbc8c3e39a 100644
--- a/www/tomcat/v7/Makefile
+++ b/www/tomcat/v7/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.47 2017/02/23 09:33:51 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.48 2017/03/23 18:35:30 dcoppa Exp $
 
 COMMENT-main =	Java servlet 3.0 and Java server pages 2.2 server
 
 MAJ_VER =	7
 MIN_VER =	0
-MICRO_VER =	75
+MICRO_VER =	76
 
 .include <bsd.port.mk>
diff --git a/www/tomcat/v7/distinfo b/www/tomcat/v7/distinfo
index d1781e6063a..25b6d3864ef 100644
--- a/www/tomcat/v7/distinfo
+++ b/www/tomcat/v7/distinfo
@@ -1,4 +1,4 @@
-SHA256 (apache-tomcat-7.0.75-fulldocs.tar.gz) = +o6TFtT2tLreL/Rgf2Gh/ZAQ9Ti1AteS+kZr0n4+Ftk=
-SHA256 (apache-tomcat-7.0.75.tar.gz) = 0Zovu8I+MQKW0el4+Oj5d7VM0yjOEM2Hm1ikQ7xuqnA=
-SIZE (apache-tomcat-7.0.75-fulldocs.tar.gz) = 5481670
-SIZE (apache-tomcat-7.0.75.tar.gz) = 8940285
+SHA256 (apache-tomcat-7.0.76-fulldocs.tar.gz) = /DXsHtDrF9qcxAD5eCE8OLEoPI0E3zIRDlxB62ZLeU8=
+SHA256 (apache-tomcat-7.0.76.tar.gz) = Y8y7CtNwd6AeH80rfP1I2UAHdZGU3LzS++EN7oW8Rr4=
+SIZE (apache-tomcat-7.0.76-fulldocs.tar.gz) = 5486077
+SIZE (apache-tomcat-7.0.76.tar.gz) = 8957288
diff --git a/www/tomcat/v7/pkg/PLIST-examples b/www/tomcat/v7/pkg/PLIST-examples
index cfa6e12ba37..8f02cb9e67e 100644
--- a/www/tomcat/v7/pkg/PLIST-examples
+++ b/www/tomcat/v7/pkg/PLIST-examples
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-examples,v 1.36 2017/02/23 09:33:51 dcoppa Exp $
+@comment $OpenBSD: PLIST-examples,v 1.37 2017/03/23 18:35:30 dcoppa Exp $
 @option is-branch
 @owner _tomcat
 @group _tomcat
@@ -1511,6 +1511,7 @@ webapps/docs/api/org/apache/tomcat/util/codec/package-summary.html
 webapps/docs/api/org/apache/tomcat/util/codec/package-tree.html
 webapps/docs/api/org/apache/tomcat/util/collections/
 webapps/docs/api/org/apache/tomcat/util/collections/ConcurrentCache.html
+webapps/docs/api/org/apache/tomcat/util/collections/ManagedConcurrentWeakHashMap.html
 webapps/docs/api/org/apache/tomcat/util/collections/package-frame.html
 webapps/docs/api/org/apache/tomcat/util/collections/package-summary.html
 webapps/docs/api/org/apache/tomcat/util/collections/package-tree.html
diff --git a/www/tomcat/v8/Makefile b/www/tomcat/v8/Makefile
index aad28a79fb3..ba00e416f16 100644
--- a/www/tomcat/v8/Makefile
+++ b/www/tomcat/v8/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.24 2017/02/23 09:33:51 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.25 2017/03/23 18:35:30 dcoppa Exp $
 
 COMMENT-main =	Java servlet 3.1 and Java server pages 2.3 server
 
 MAJ_VER =	8
 MIN_VER =	5
-MICRO_VER =	11
+MICRO_VER =	12
 
 .include <bsd.port.mk>
diff --git a/www/tomcat/v8/distinfo b/www/tomcat/v8/distinfo
index 1317f89d359..0142b7d3fde 100644
--- a/www/tomcat/v8/distinfo
+++ b/www/tomcat/v8/distinfo
@@ -1,4 +1,4 @@
-SHA256 (apache-tomcat-8.5.11-fulldocs.tar.gz) = zUMyjuIyUMKLmgXPM0bf7D+r5OYCWMXYG6rFAYDhHyc=
-SHA256 (apache-tomcat-8.5.11.tar.gz) = VjKoyWwX03n5HSYh6u8YrBJ+RKjO5r4Re4pQIu/bPUQ=
-SIZE (apache-tomcat-8.5.11-fulldocs.tar.gz) = 5736647
-SIZE (apache-tomcat-8.5.11.tar.gz) = 9285465
+SHA256 (apache-tomcat-8.5.12-fulldocs.tar.gz) = eitFd8Ljh6AA8pG2o4KRqExUflKfPs1VMUragSv+sr4=
+SHA256 (apache-tomcat-8.5.12.tar.gz) = bSytG1ldDMgIP5u7tzw1nWESScfq8oPEDLSuTKnEZEo=
+SIZE (apache-tomcat-8.5.12-fulldocs.tar.gz) = 5750182
+SIZE (apache-tomcat-8.5.12.tar.gz) = 9353658
diff --git a/www/tomcat/v8/pkg/PLIST-examples b/www/tomcat/v8/pkg/PLIST-examples
index 0013f0fc6bd..58db67078ef 100644
--- a/www/tomcat/v8/pkg/PLIST-examples
+++ b/www/tomcat/v8/pkg/PLIST-examples
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-examples,v 1.23 2017/02/23 09:33:51 dcoppa Exp $
+@comment $OpenBSD: PLIST-examples,v 1.24 2017/03/23 18:35:30 dcoppa Exp $
 @option is-branch
 @owner _tomcat
 @group _tomcat
@@ -442,15 +442,17 @@ webapps/docs/api/org/apache/catalina/security/package-frame.html
 webapps/docs/api/org/apache/catalina/security/package-summary.html
 webapps/docs/api/org/apache/catalina/security/package-tree.html
 webapps/docs/api/org/apache/catalina/servlet4preview/
+webapps/docs/api/org/apache/catalina/servlet4preview/AsyncContext.html
 webapps/docs/api/org/apache/catalina/servlet4preview/GenericFilter.html
 webapps/docs/api/org/apache/catalina/servlet4preview/RequestDispatcher.html
+webapps/docs/api/org/apache/catalina/servlet4preview/ServletContext.html
 webapps/docs/api/org/apache/catalina/servlet4preview/http/
 webapps/docs/api/org/apache/catalina/servlet4preview/http/HttpFilter.html
 webapps/docs/api/org/apache/catalina/servlet4preview/http/HttpServletRequest.html
 webapps/docs/api/org/apache/catalina/servlet4preview/http/HttpServletRequestWrapper.html
-webapps/docs/api/org/apache/catalina/servlet4preview/http/Mapping.html
 webapps/docs/api/org/apache/catalina/servlet4preview/http/MappingMatch.html
 webapps/docs/api/org/apache/catalina/servlet4preview/http/PushBuilder.html
+webapps/docs/api/org/apache/catalina/servlet4preview/http/ServletMapping.html
 webapps/docs/api/org/apache/catalina/servlet4preview/http/package-frame.html
 webapps/docs/api/org/apache/catalina/servlet4preview/http/package-summary.html
 webapps/docs/api/org/apache/catalina/servlet4preview/http/package-tree.html
@@ -928,7 +930,6 @@ webapps/docs/api/org/apache/coyote/OutputBuffer.html
 webapps/docs/api/org/apache/coyote/Processor.html
 webapps/docs/api/org/apache/coyote/ProtocolException.html
 webapps/docs/api/org/apache/coyote/ProtocolHandler.html
-webapps/docs/api/org/apache/coyote/PushToken.html
 webapps/docs/api/org/apache/coyote/Request.html
 webapps/docs/api/org/apache/coyote/RequestGroupInfo.html
 webapps/docs/api/org/apache/coyote/RequestInfo.html
@@ -1687,6 +1688,7 @@ webapps/docs/api/org/apache/tomcat/util/file/package-summary.html
 webapps/docs/api/org/apache/tomcat/util/file/package-tree.html
 webapps/docs/api/org/apache/tomcat/util/http/
 webapps/docs/api/org/apache/tomcat/util/http/CookieProcessor.html
+webapps/docs/api/org/apache/tomcat/util/http/CookieProcessorBase.html
 webapps/docs/api/org/apache/tomcat/util/http/FastHttpDateFormat.html
 webapps/docs/api/org/apache/tomcat/util/http/LegacyCookieProcessor.html
 webapps/docs/api/org/apache/tomcat/util/http/MimeHeaders.html
diff --git a/www/tomcat/v8/pkg/PLIST-main b/www/tomcat/v8/pkg/PLIST-main
index 93a144d4e10..c33a0ec0d64 100644
--- a/www/tomcat/v8/pkg/PLIST-main
+++ b/www/tomcat/v8/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.9 2017/02/23 09:33:51 dcoppa Exp $
+@comment $OpenBSD: PLIST-main,v 1.10 2017/03/23 18:35:30 dcoppa Exp $
 @option is-branch
 @newgroup _tomcat:526
 @newuser _tomcat:526:_tomcat:daemon:Tomcat Account:/nonexistent:/sbin/nologin
@@ -102,7 +102,7 @@ tomcat/lib/catalina-ha.jar
 tomcat/lib/catalina-storeconfig.jar
 tomcat/lib/catalina-tribes.jar
 tomcat/lib/catalina.jar
-tomcat/lib/ecj-4.5.1.jar
+tomcat/lib/ecj-4.6.1.jar
 tomcat/lib/el-api.jar
 tomcat/lib/jasper-el.jar
 tomcat/lib/jasper.jar