diff --git a/www/tomcat85/Makefile b/www/tomcat85/Makefile
index 08fc07a6de98..a32440c43411 100644
--- a/www/tomcat85/Makefile
+++ b/www/tomcat85/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tomcat
 PORTVERSION=	8.5.30
+PORTREVISION=	1
 CATEGORIES=	www java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION:C/([0-9])(.*)/\1/}/v${PORTVERSION}/bin
 PKGNAMESUFFIX=	85
diff --git a/www/tomcat85/files/tomcat85.in b/www/tomcat85/files/tomcat85.in
index d34efeaad692..8cbc67a86002 100644
--- a/www/tomcat85/files/tomcat85.in
+++ b/www/tomcat85/files/tomcat85.in
@@ -131,15 +131,4 @@ command_args="-java-home '${_tomcat_java_home}' \
 	org.apache.catalina.startup.Bootstrap \
 	${_tomcat_pipe_cmd}"
 
-start_precmd="tomcat_prestart"
-
-tomcat_prestart()
-{
-	if [ -r "${_tomcat_catalina_base}/bin/setenv.sh" ]; then
-		. "${_tomcat_catalina_base}/bin/setenv.sh"
-	elif [ -r "${_tomcat_catalina_home}/bin/setenv.sh" ]; then
-		. "${_tomcat_catalina_home}/bin/setenv.sh"
-	fi
-}
-
 run_rc_command "$1"