diff --git a/srcpkgs/apache-tomcat/template b/srcpkgs/apache-tomcat/template
index 277d1775a5d..4cbee1fd363 100644
--- a/srcpkgs/apache-tomcat/template
+++ b/srcpkgs/apache-tomcat/template
@@ -1,21 +1,22 @@
 # Template file for 'apache-tomcat'
 pkgname=apache-tomcat
-version=9.0.14
+version=9.0.16
 revision=1
 wrksrc="${pkgname}-${version}-src"
 hostmakedepends="openjdk apache-ant"
 depends="virtual?java-runtime"
-make_dirs="/usr/share/${pkgname}/webapps 0755 tomcat tomcat \
- /usr/share/${pkgname}/conf 0755 tomcat tomcat \
- /usr/share/${pkgname}/logs 0755 tomcat tomcat \
- /usr/share/${pkgname}/temp 0755 tomcat tomcat"
-system_accounts="tomcat"
-short_desc="An open source implementation of the Java Servlet"
+short_desc="Open source implementation of the Java Servlet"
 maintainer="Michael Aldridge <maldridge@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://tomcat.apache.org"
 distfiles="http://mirrors.gigenet.com/apache/tomcat/tomcat-9/v${version}/src/${pkgname}-${version}-src.tar.gz"
-checksum=c91d8cc379ad37a16d838fb3049e97d2db92df0f46f10b67ff3010c6b33b651c
+checksum=43371139d18ca99a0f8a624dd61cec4ca8fa5e2fbdf8d65b987ac34b2fcc090b
+
+system_accounts="tomcat"
+make_dirs="/usr/share/${pkgname}/webapps 0755 tomcat tomcat \
+ /usr/share/${pkgname}/conf 0755 tomcat tomcat \
+ /usr/share/${pkgname}/logs 0755 tomcat tomcat \
+ /usr/share/${pkgname}/temp 0755 tomcat tomcat"
 
 do_build() {
 	ant
@@ -39,6 +40,7 @@ post_install() {
 }
 
 apache-tomcat-doc_package() {
+	archs=noarch
 	short_desc+=" - Documentation"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
@@ -47,6 +49,7 @@ apache-tomcat-doc_package() {
 }
 
 apache-tomcat-examples_package() {
+	archs=naorch
 	short_desc+=" - Examples"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
@@ -55,6 +58,7 @@ apache-tomcat-examples_package() {
 }
 
 apache-tomcat-manager_package() {
+	archs=noarch
 	short_desc+=" - Manager"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
@@ -63,6 +67,7 @@ apache-tomcat-manager_package() {
 }
 
 apache-tomcat-host-manager_package() {
+	archs=noarch
 	short_desc+=" - Host Manager"
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {