diff --git a/www/tomcat-devel/Makefile b/www/tomcat-devel/Makefile
index 09c836dad767..d140d367a371 100644
--- a/www/tomcat-devel/Makefile
+++ b/www/tomcat-devel/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	tomcat
 DISTVERSION=	11.0.6
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	-devel
diff --git a/www/tomcat-devel/files/tomcat_devel.in b/www/tomcat-devel/files/tomcat_devel.in
index ba526b0f60b5..89df00dd6075 100644
--- a/www/tomcat-devel/files/tomcat_devel.in
+++ b/www/tomcat-devel/files/tomcat_devel.in
@@ -110,6 +110,15 @@ extra_commands="reload"
 
 _tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'`
 
+export JAVA_TOOL_OPTIONS="\
+	--add-opens=java.base/java.lang=ALL-UNNAMED \
+	--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
+	--add-opens=java.base/java.io=ALL-UNNAMED \
+	--add-opens=java.base/java.util=ALL-UNNAMED \
+	--add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
+	--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED \
+	--enable-native-access=ALL-UNNAMED"
+
 command="%%LOCALBASE%%/bin/jsvc"
 command_args="-java-home '${_tomcat_java_home}' \
 	-server \
diff --git a/www/tomcat101/Makefile b/www/tomcat101/Makefile
index 93c35aa5b5a8..5f3401c6b053 100644
--- a/www/tomcat101/Makefile
+++ b/www/tomcat101/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	tomcat
 DISTVERSION=	10.1.40
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	101
diff --git a/www/tomcat101/files/tomcat101.in b/www/tomcat101/files/tomcat101.in
index 23b76fa45595..ac405c2fc815 100644
--- a/www/tomcat101/files/tomcat101.in
+++ b/www/tomcat101/files/tomcat101.in
@@ -110,6 +110,14 @@ extra_commands="reload"
 
 _tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'`
 
+export JAVA_TOOL_OPTIONS="\
+	--add-opens=java.base/java.lang=ALL-UNNAMED \
+	--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
+	--add-opens=java.base/java.io=ALL-UNNAMED \
+	--add-opens=java.base/java.util=ALL-UNNAMED \
+	--add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
+	--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
+
 command="%%LOCALBASE%%/bin/jsvc"
 command_args="-java-home '${_tomcat_java_home}' \
 	-server \
diff --git a/www/tomcat110/Makefile b/www/tomcat110/Makefile
index 0269bb6a6409..fd6db53a3cb3 100644
--- a/www/tomcat110/Makefile
+++ b/www/tomcat110/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	tomcat
 DISTVERSION=	11.0.6
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	110
diff --git a/www/tomcat110/files/tomcat110.in b/www/tomcat110/files/tomcat110.in
index 106ba8add9c3..b375c9a2d0ff 100644
--- a/www/tomcat110/files/tomcat110.in
+++ b/www/tomcat110/files/tomcat110.in
@@ -110,6 +110,15 @@ extra_commands="reload"
 
 _tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk -F '"' '/version/ {print $2}'`
 
+export JAVA_TOOL_OPTIONS="\
+	--add-opens=java.base/java.lang=ALL-UNNAMED \
+	--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
+	--add-opens=java.base/java.io=ALL-UNNAMED \
+	--add-opens=java.base/java.util=ALL-UNNAMED \
+	--add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
+	--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED \
+	--enable-native-access=ALL-UNNAMED"
+
 command="%%LOCALBASE%%/bin/jsvc"
 command_args="-java-home '${_tomcat_java_home}' \
 	-server \
diff --git a/www/tomcat9/Makefile b/www/tomcat9/Makefile
index 1ed6228bffd5..8b4efd75b3ea 100644
--- a/www/tomcat9/Makefile
+++ b/www/tomcat9/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	tomcat
 DISTVERSION=	9.0.104
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9])(.*)/\1/}/v${DISTVERSION}/bin
 PKGNAMESUFFIX=	9
diff --git a/www/tomcat9/files/tomcat9.in b/www/tomcat9/files/tomcat9.in
index 36b33fa6a628..21f4624e41e4 100644
--- a/www/tomcat9/files/tomcat9.in
+++ b/www/tomcat9/files/tomcat9.in
@@ -113,6 +113,14 @@ _tomcat_java_version=`${_tomcat_java_home}/bin/java -version 2>&1 | /usr/bin/awk
 case "${_tomcat_java_version}" in
 	9* | [1-2][0-9]* )
 		_tomcat_endorsed_dirs_option=
+		export JAVA_TOOL_OPTIONS="\
+			--add-opens=java.base/java.lang=ALL-UNNAMED \
+			--add-opens=java.base/java.lang.invoke=ALL-UNNAMED \
+			--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
+			--add-opens=java.base/java.io=ALL-UNNAMED \
+			--add-opens=java.base/java.util=ALL-UNNAMED \
+			--add-opens=java.base/java.util.concurrent=ALL-UNNAMED \
+			--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
 		;;
 	*)
 		_tomcat_endorsed_dirs_option="-Djava.endorsed.dirs='${_tomcat_catalina_home}/endorsed'"