--- a/components/tomcat-8/Makefile	Thu Dec 08 07:04:47 2016 -0800
+++ b/components/tomcat-8/Makefile	Tue Nov 22 04:23:48 2016 -0800
@@ -26,12 +26,12 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		tomcat
-COMPONENT_VERSION=	8.5.5
+COMPONENT_VERSION=	8.5.8
 COMPONENT_PROJECT_URL=	http://tomcat.apache.org/
 COMPONENT_SRC_NAME=	apache-tomcat
 COMPONENT_SRC=		$(COMPONENT_SRC_NAME)-$(COMPONENT_VERSION)-src
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:28c50366e0b8f16086ab792fbe4c3dba5a716185d0c8c143661b7fed870147c0
+    sha256:ee58ee69d536d7a8f748ed7b334eb2161d3d75664f0c87178b12fe5eebbbe45f
 COMPONENT_ARCHIVE_URL=	http://www.apache.org/dist/tomcat/tomcat-8/v$(COMPONENT_VERSION)/src/$(COMPONENT_ARCHIVE)
 
 # Tomcat subcomponents
@@ -40,7 +40,7 @@
     sha256:101a31ee0474282a287b16c46fa6e793ede43ceecaecabbd382f6e0b1b67ef72
 COMPONENT_ARCHIVE_URL_1= http://archive.eclipse.org/eclipse/downloads/drops4/R-4.5.1-201509040015/$(COMPONENT_ARCHIVE_1)
 
-TPNO=			31550
+TPNO=			32738
 
 BUILD_STYLE= ant
 TEST_TARGET= $(SKIP_TEST)

--- a/components/tomcat-8/Solaris/tomcat.8	Thu Dec 08 07:04:47 2016 -0800
+++ b/components/tomcat-8/Solaris/tomcat.8	Tue Nov 22 04:23:48 2016 -0800
@@ -1,6 +1,6 @@
 '\" te
 .\" Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
-.TH tomcat8 8 "26 Jul 2016" "SunOS 5.12" "System Administration Commands"
+.TH tomcat8 8 "8 Dec 2016" "SunOS 5.12" "System Administration Commands"
 .SH NAME
 tomcat \- Apache Tomcat Version 8 overview
 .SH DESCRIPTION
@@ -19,7 +19,7 @@
 .fi
 .in -2
 .sp
-Tomcat enabled via SMF is executed for better security with "webserv"
+Tomcat enabled via SMF is executed for better security with "webservd"
 user credentials and with added "net_privaddr" privilege so it can be
 configured to listen on privileged TCP ports (e.g. 80). With default
 configuration Tomcat listens on TCP port 8080.
@@ -149,7 +149,7 @@
 page which is shown when web/java-servlet/tomcat/tomcat-examples (and thus HTML file) is not
 installed. This shall allow better deployment of custom ROOT web
 application while maintain upgrade ability via packaging system (without
-loosing data).
+losing data).
 .RE
 
 .sp

--- a/components/tomcat-8/tomcat.p5m	Thu Dec 08 07:04:47 2016 -0800
+++ b/components/tomcat-8/tomcat.p5m	Tue Nov 22 04:23:48 2016 -0800
@@ -123,6 +123,7 @@
 file path=usr/tomcat8/docs/config/globalresources.html
 file path=usr/tomcat8/docs/config/host.html
 file path=usr/tomcat8/docs/config/http.html
+file path=usr/tomcat8/docs/config/http2.html
 file path=usr/tomcat8/docs/config/index.html
 file path=usr/tomcat8/docs/config/jar-scan-filter.html
 file path=usr/tomcat8/docs/config/jar-scanner.html