diff --git a/www/tomcat/v8/Makefile b/www/tomcat/v8/Makefile
index 9fea90ce54d..05b61d38631 100644
--- a/www/tomcat/v8/Makefile
+++ b/www/tomcat/v8/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.21 2016/10/21 12:53:03 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.22 2016/11/14 18:45:07 dcoppa Exp $
 
 COMMENT-main =	Java servlet 3.1 and Java server pages 2.3 server
 
 MAJ_VER =	8
 MIN_VER =	5
-MICRO_VER =	6
+MICRO_VER =	8
 
 .include <bsd.port.mk>
diff --git a/www/tomcat/v8/distinfo b/www/tomcat/v8/distinfo
index 2870273a78f..cfe132c33e1 100644
--- a/www/tomcat/v8/distinfo
+++ b/www/tomcat/v8/distinfo
@@ -1,4 +1,4 @@
-SHA256 (apache-tomcat-8.5.6-fulldocs.tar.gz) = amtdgnVhcaiEed/50MrxZvVCxcXGLcEob0sIIQ/vfG4=
-SHA256 (apache-tomcat-8.5.6.tar.gz) = hWTNlXCt/SM5T9YqTPmZopRCnl8pAX5LspLGBOrpZ3s=
-SIZE (apache-tomcat-8.5.6-fulldocs.tar.gz) = 5745311
-SIZE (apache-tomcat-8.5.6.tar.gz) = 9304958
+SHA256 (apache-tomcat-8.5.8-fulldocs.tar.gz) = IcLQeEPox+W2kaiQFQ8fgWodvvIK35YfDWJtNJJry0w=
+SHA256 (apache-tomcat-8.5.8.tar.gz) = QPfuKAS9fcyk2F8bdDF0dN4WG0GGMBmWXTeBehLS3OU=
+SIZE (apache-tomcat-8.5.8-fulldocs.tar.gz) = 5764418
+SIZE (apache-tomcat-8.5.8.tar.gz) = 9323097
diff --git a/www/tomcat/v8/pkg/PLIST-examples b/www/tomcat/v8/pkg/PLIST-examples
index c143dc58ca9..9d8bc753de1 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.20 2016/10/21 12:53:03 dcoppa Exp $
+@comment $OpenBSD: PLIST-examples,v 1.21 2016/11/14 18:45:07 dcoppa Exp $
 @option is-branch
 @owner _tomcat
 @group _tomcat
@@ -920,6 +920,7 @@ webapps/docs/api/org/apache/coyote/ActionHook.html
 webapps/docs/api/org/apache/coyote/Adapter.html
 webapps/docs/api/org/apache/coyote/AsyncContextCallback.html
 webapps/docs/api/org/apache/coyote/AsyncStateMachine.html
+webapps/docs/api/org/apache/coyote/CloseNowException.html
 webapps/docs/api/org/apache/coyote/Constants.html
 webapps/docs/api/org/apache/coyote/ContainerThreadMarker.html
 webapps/docs/api/org/apache/coyote/ErrorState.html
@@ -1001,7 +1002,6 @@ webapps/docs/api/org/apache/coyote/http2/FrameType.html
 webapps/docs/api/org/apache/coyote/http2/HPackHuffman.HuffmanCode.html
 webapps/docs/api/org/apache/coyote/http2/HPackHuffman.html
 webapps/docs/api/org/apache/coyote/http2/HeaderSink.html
-webapps/docs/api/org/apache/coyote/http2/HpackDecoder.HeaderEmitter.html
 webapps/docs/api/org/apache/coyote/http2/HpackDecoder.html
 webapps/docs/api/org/apache/coyote/http2/HpackEncoder.HpackHeaderFunction.html
 webapps/docs/api/org/apache/coyote/http2/HpackEncoder.State.html
@@ -1809,6 +1809,7 @@ webapps/docs/api/org/apache/tomcat/util/net/AbstractEndpoint.Handler.SocketState
 webapps/docs/api/org/apache/tomcat/util/net/AbstractEndpoint.Handler.html
 webapps/docs/api/org/apache/tomcat/util/net/AbstractEndpoint.html
 webapps/docs/api/org/apache/tomcat/util/net/AbstractJsseEndpoint.html
+webapps/docs/api/org/apache/tomcat/util/net/ApplicationBufferHandler.html
 webapps/docs/api/org/apache/tomcat/util/net/AprEndpoint.Acceptor.html
 webapps/docs/api/org/apache/tomcat/util/net/AprEndpoint.AprSocketWrapper.html
 webapps/docs/api/org/apache/tomcat/util/net/AprEndpoint.Poller.html
@@ -1854,7 +1855,6 @@ webapps/docs/api/org/apache/tomcat/util/net/SSLUtil.ProtocolInfo.html
 webapps/docs/api/org/apache/tomcat/util/net/SSLUtil.html
 webapps/docs/api/org/apache/tomcat/util/net/SSLUtilBase.html
 webapps/docs/api/org/apache/tomcat/util/net/SecureNio2Channel.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/SendfileDataBase.html
 webapps/docs/api/org/apache/tomcat/util/net/SendfileState.html
@@ -2090,6 +2090,7 @@ webapps/docs/config/filter.html
 webapps/docs/config/globalresources.html
 webapps/docs/config/host.html
 webapps/docs/config/http.html
+webapps/docs/config/http2.html
 webapps/docs/config/index.html
 webapps/docs/config/jar-scan-filter.html
 webapps/docs/config/jar-scanner.html