diff --git a/www/tomcat85/Makefile b/www/tomcat85/Makefile
index d4afcea615ff..30da8345f321 100644
--- a/www/tomcat85/Makefile
+++ b/www/tomcat85/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tomcat
 PORTVERSION=	8.5.35
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
 PKGNAMESUFFIX=	85
@@ -45,6 +46,8 @@ TOMCAT_HOME=	${PREFIX}/${TOMCAT_SUBDIR}
 
 post-patch:
 	@${RM} ${WRKSRC}/bin/commons-daemon-native.tar.gz ${WRKSRC}/bin/commons-daemon.jar ${WRKSRC}/bin/tomcat-native.tar.gz
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; s|%%JAVAJARDIR%%|${JAVAJARDIR}|g' ${WRKSRC}/bin/daemon.sh
+	@${FIND} ${WRKSRC} -name '*.bak' -delete -o -name '*.orig' -delete
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs
diff --git a/www/tomcat85/files/patch-bin__daemon.sh b/www/tomcat85/files/patch-bin__daemon.sh
new file mode 100644
index 000000000000..c05967458967
--- /dev/null
+++ b/www/tomcat85/files/patch-bin__daemon.sh
@@ -0,0 +1,26 @@
+--- bin/daemon.sh.orig
++++ bin/daemon.sh
+@@ -113,12 +113,9 @@
+ test ".$CATALINA_HOME" = . && CATALINA_HOME=`cd "$DIRNAME/.." >/dev/null; pwd`
+ test ".$CATALINA_BASE" = . && CATALINA_BASE="$CATALINA_HOME"
+ test ".$CATALINA_MAIN" = . && CATALINA_MAIN=org.apache.catalina.startup.Bootstrap
+-# If not explicitly set, look for jsvc in CATALINA_BASE first then CATALINA_HOME
++# If not explicitly set, look for jsvc in %%PREFIX%%
+ if [ -z "$JSVC" ]; then
+-    JSVC="$CATALINA_BASE/bin/jsvc"
+-    if [ ! -x "$JSVC" ]; then
+-        JSVC="$CATALINA_HOME/bin/jsvc"
+-    fi
++    JSVC="%%PREFIX%%/bin/jsvc"
+ fi
+ # Set the default service-start wait time if necessary
+ test ".$SERVICE_START_WAIT_TIME" = . && SERVICE_START_WAIT_TIME=10
+@@ -135,7 +132,7 @@
+ 
+ # Add on extra jar files to CLASSPATH
+ test ".$CLASSPATH" != . && CLASSPATH="${CLASSPATH}:"
+-CLASSPATH="$CLASSPATH$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/commons-daemon.jar"
++CLASSPATH="$CLASSPATH$CATALINA_HOME/bin/bootstrap.jar:%%JAVAJARDIR%%/commons-daemon.jar"
+ 
+ test ".$CATALINA_OUT" = . && CATALINA_OUT="$CATALINA_BASE/logs/catalina-daemon.out"
+ test ".$CATALINA_TMP" = . && CATALINA_TMP="$CATALINA_BASE/temp"
diff --git a/www/tomcat9/Makefile b/www/tomcat9/Makefile
index ca0d447bf127..72d5dae2751b 100644
--- a/www/tomcat9/Makefile
+++ b/www/tomcat9/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tomcat
 PORTVERSION=	9.0.13
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
 PKGNAMESUFFIX=	9
@@ -45,6 +46,8 @@ TOMCAT_HOME=	${PREFIX}/${TOMCAT_SUBDIR}
 
 post-patch:
 	@${RM} ${WRKSRC}/bin/commons-daemon-native.tar.gz ${WRKSRC}/bin/commons-daemon.jar ${WRKSRC}/bin/tomcat-native.tar.gz
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; s|%%JAVAJARDIR%%|${JAVAJARDIR}|g' ${WRKSRC}/bin/daemon.sh
+	@${FIND} ${WRKSRC} -name '*.bak' -delete -o -name '*.orig' -delete
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs
diff --git a/www/tomcat9/files/patch-bin__daemon.sh b/www/tomcat9/files/patch-bin__daemon.sh
new file mode 100644
index 000000000000..d43ad7ef1eb6
--- /dev/null
+++ b/www/tomcat9/files/patch-bin__daemon.sh
@@ -0,0 +1,26 @@
+--- bin/daemon.sh.orig
++++ bin/daemon.sh
+@@ -115,12 +115,9 @@
+ test ".$CATALINA_HOME" = . && CATALINA_HOME=`cd "$DIRNAME/.." >/dev/null; pwd`
+ test ".$CATALINA_BASE" = . && CATALINA_BASE="$CATALINA_HOME"
+ test ".$CATALINA_MAIN" = . && CATALINA_MAIN=org.apache.catalina.startup.Bootstrap
+-# If not explicitly set, look for jsvc in CATALINA_BASE first then CATALINA_HOME
++# If not explicitly set, look for jsvc in %%PREFIX%%
+ if [ -z "$JSVC" ]; then
+-    JSVC="$CATALINA_BASE/bin/jsvc"
+-    if [ ! -x "$JSVC" ]; then
+-        JSVC="$CATALINA_HOME/bin/jsvc"
+-    fi
++    JSVC="%%PREFIX%%/bin/jsvc"
+ fi
+ # Set the default service-start wait time if necessary
+ test ".$SERVICE_START_WAIT_TIME" = . && SERVICE_START_WAIT_TIME=10
+@@ -137,7 +134,7 @@
+ 
+ # Add on extra jar files to CLASSPATH
+ test ".$CLASSPATH" != . && CLASSPATH="$CLASSPATH:"
+-CLASSPATH="$CLASSPATH$CATALINA_HOME/bin/bootstrap.jar:$CATALINA_HOME/bin/commons-daemon.jar"
++CLASSPATH="$CLASSPATH$CATALINA_HOME/bin/bootstrap.jar:%%JAVAJARDIR%%/commons-daemon.jar"
+ 
+ test ".$CATALINA_OUT" = . && CATALINA_OUT="$CATALINA_BASE/logs/catalina-daemon.out"
+ test ".$CATALINA_TMP" = . && CATALINA_TMP="$CATALINA_BASE/temp"