diff --git a/www/tomcat55/Makefile b/www/tomcat55/Makefile
index 59c2e4358e21..06e3c4e7f43b 100644
--- a/www/tomcat55/Makefile
+++ b/www/tomcat55/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tomcat
 PORTVERSION=	5.5.35
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	tomcat/tomcat-5/v${PORTVERSION}/bin
@@ -16,8 +16,10 @@ DISTNAME=	apache-tomcat-${PORTVERSION}
 MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	Open-source Java web server by Apache, 5.5.x branch
 
+OPTIONS_DEFINE=	LOG
 OPTIONS_SINGLE=	LOG
-OPTIONS_SINGLE_LOG=	CRONOLOG CRONOLOG_DEVEL
+OPTIONS_SINGLE_LOG= CRONOLOG CRONOLOG_DEVEL
+LOG_DESC=	Use Log Pre-Processor
 CRONOLOG_DESC=	Use Cronolog for Log Processing
 CRONOLOG_DEVEL_DESC=	Use Cronlog-Devel for Log Processing
 
@@ -96,7 +98,7 @@ RUN_DEPENDS+=	cronolog:${PORTSDIR}/sysutils/cronolog
 RUN_DEPENDS+=	cronolog:${PORTSDIR}/sysutils/cronolog-devel
 .endif
 
-.if ( empty(PORT_OPTIONS:MCRONOLOG) &&  empty(PORT_OPTIONS:MCRONOLOG_DEVEL) )
+.if empty(PORT_OPTIONS:MLOG)
 LOG_ARGS?=">> \$${tomcat\%\%TOMCAT_VERSION\%\%_stdout_log} 2>> \$${tomcat\%\%TOMCAT_VERSION\%\%_stderr_log}"
 .else
 LOG_ARGS?="2>\&1 | ${LOCALBASE}/sbin/cronolog --link \$${tomcat\%\%TOMCAT_VERSION\%\%_catalina_base}/logs/catalina.out \$${tomcat\%\%TOMCAT_VERSION\%\%_catalina_base}/logs/catalina.\%Y_\%m_\%d.out >/dev/null 2>\&1 \&"