diff --git a/www/tomcat9/Makefile b/www/tomcat9/Makefile
index f30c70a62b07..bfd3a8916c1c 100644
--- a/www/tomcat9/Makefile
+++ b/www/tomcat9/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tomcat
-PORTVERSION=	9.0.21
+PORTVERSION=	9.0.22
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
 PKGNAMESUFFIX=	9
diff --git a/www/tomcat9/distinfo b/www/tomcat9/distinfo
index 3d5a7a8e78ec..b88e3e0a0f43 100644
--- a/www/tomcat9/distinfo
+++ b/www/tomcat9/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1560891724
-SHA256 (apache-tomcat-9.0.21.tar.gz) = 50ee20a573d80c93a6a4f50caf429a7cd38256126a747df97097f8b9f1a25e5b
-SIZE (apache-tomcat-9.0.21.tar.gz) = 10874669
+TIMESTAMP = 1563135834
+SHA256 (apache-tomcat-9.0.22.tar.gz) = 86b30768f7674409dfe1091e0917637bfa3b1b699851112bef99b65673039168
+SIZE (apache-tomcat-9.0.22.tar.gz) = 10929702
diff --git a/www/tomcat9/pkg-plist b/www/tomcat9/pkg-plist
index e537eeecd656..7f6e9004b869 100644
--- a/www/tomcat9/pkg-plist
+++ b/www/tomcat9/pkg-plist
@@ -25,7 +25,7 @@
 %%T%%/lib/catalina-storeconfig.jar
 %%T%%/lib/catalina-tribes.jar
 %%T%%/lib/catalina.jar
-%%T%%/lib/ecj-4.10.jar
+%%T%%/lib/ecj-4.12.jar
 %%T%%/lib/el-api.jar
 %%T%%/lib/jasper-el.jar
 %%T%%/lib/jasper.jar
@@ -104,6 +104,7 @@
 %%DOCS%%%%T%%/webapps/docs/architecture/startup/serverStartup.txt
 %%DOCS%%%%T%%/webapps/docs/balancer-howto.html
 %%DOCS%%%%T%%/webapps/docs/building.html
+%%DOCS%%%%T%%/webapps/docs/cdi.html
 %%DOCS%%%%T%%/webapps/docs/cgi-howto.html
 %%DOCS%%%%T%%/webapps/docs/changelog.html
 %%DOCS%%%%T%%/webapps/docs/class-loader-howto.html