diff --git a/security/bastillion/Makefile b/security/bastillion/Makefile
index 329d15e0755f..30c08e8154f2 100644
--- a/security/bastillion/Makefile
+++ b/security/bastillion/Makefile
@@ -1,94 +1,96 @@
+# $FreeBSD: head/security/bastillion/Makefile 513677 2019-10-03 17:22:17Z glewis $
+
 PORTNAME=		bastillion
 DISTVERSIONPREFIX=	jetty-v
 DISTVERSION=		3.10_00
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 			${PORTNAME}-upgrade-3.08.00.jar
-PORTREVISION=		0
+PORTREVISION=		1
 CATEGORIES=		security www java
 MASTER_SITES=		https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${PORTVERSION}/
 
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Web-based SSH console
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		shebangfix
 USE_JAVA=	yes
 USE_GITHUB=	nodefault
 
 SHEBANG_FILES=	jetty_bastillion/bin/jetty.sh
 GH_ACCOUNT=	bastillion-io
 GH_PROJECT=	Bastillion
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 JAVA_VERSION=	11+
 JAVA_VENDOR=	openjdk
 USE_RC_SUBR=	${PORTNAME}
 
 WRKSRC=		${WRKDIR}/Bastillion-jetty
 
 APP_NAME=	${PORTNAME}
 WWWDIR=		www/${PORTNAME}
 
 USERS=		www
 GROUPS=		www
 
 SUB_LIST=	\
 		APP_NAME=${APP_NAME} \
 		JAVA_HOME=${JAVA_HOME} \
 		JAVA=${JAVA} \
 		WWWDIR=${WWWDIR}
 
 SUB_FILES=	\
 		${APP_NAME} \
 		bastillion.sample \
 		pkg-message
 
 PLIST_SUB=	APP_NAME=${APP_NAME} \
 		WWWDIR=${WWWDIR}
 
 post-extract:
 	${RM} ${WRKSRC}/*.bat ${WRKSRC}/startBastillion.sh
 	${MV} ${WRKSRC}/jetty ${WRKSRC}/jetty_bastillion
 	${MV} ${WRKSRC}/jetty_bastillion/bastillion/WEB-INF/classes/BastillionConfig.properties ${WRKSRC}/jetty_bastillion/bastillion/WEB-INF/classes/BastillionConfig.properties.sample
 	${MV} ${WRKSRC}/jetty_bastillion/start.ini ${WRKSRC}/
 	${MV} ${WRKSRC}/jetty_bastillion/webapps ${WRKSRC}/
 	${MV} ${WRKSRC}/jetty_bastillion/etc ${WRKSRC}/
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${WWWDIR}/work
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}/var/log/${PORTNAME}
 	${MKDIR} ${STAGEDIR}/var/run/${PORTNAME}
 	cd ${WRKSRC}; ${COPYTREE_BIN} jetty_bastillion ${STAGEDIR}${PREFIX} "! -name *\.orig"
 	${MKDIR} ${STAGEDIR}${PREFIX}/jetty_bastillion/upgrade
 	cd ${WRKSRC}; ${COPYTREE_SHARE} webapps ${STAGEDIR}${PREFIX}/${WWWDIR} "! -name *\.orig"
 	cd ${WRKSRC}; ${COPYTREE_SHARE} etc ${STAGEDIR}${PREFIX}/${WWWDIR} "! -name *\.orig"
 	${RLN} ${STAGEDIR}${PREFIX}/${WWWDIR}/etc ${STAGEDIR}${PREFIX}/jetty_bastillion/etc
 	${INSTALL_DATA} ${WRKSRC}/start.ini ${STAGEDIR}${PREFIX}/${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.md ${STAGEDIR}${PREFIX}/${WWWDIR}
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.sample ${STAGEDIR}${ETCDIR}/
 	${INSTALL_DATA} ${DISTDIR}/bastillion-upgrade-3.08.00.jar ${STAGEDIR}${PREFIX}/jetty_bastillion/upgrade/
 
 gen-plist:
 	${ECHO} '@sample %%ETCDIR%%/%%APP_NAME%%.sample' >${PLIST}.new
 	${ECHO} '@sample(www,www,644) jetty_bastillion/bastillion/WEB-INF/classes/BastillionConfig.properties.sample' >> ${PLIST}.new
 	${ECHO} '@dir(www,www,755) /var/log/%%APP_NAME%%' >> ${PLIST}.new
 	${ECHO} '@dir(www,www,755) /var/run/%%APP_NAME%%' >> ${PLIST}.new
 	${FIND} ${STAGEDIR}${PREFIX}/jetty_bastillion -type f -a ! -name \*.orig -a ! -name \*.sample | ${SED} -e "s:${STAGEDIR}${PREFIX}/::g" | ${SORT} >> ${PLIST}.new
 	${ECHO} '@dir(www,www,755) jetty_bastillion/bastillion/WEB-INF/classes' >> ${PLIST}.new
 	${ECHO} '@dir(www,www,755) %%WWWDIR%%' >> ${PLIST}.new
 	${ECHO} '@dir(www,www,755) %%WWWDIR%%/work' >> ${PLIST}.new
 	${ECHO} '%%WWWDIR%%/start.ini' >> ${PLIST}.new
 	${ECHO} '%%WWWDIR%%/3rdPartyLicenses.md' >> ${PLIST}.new
 	${ECHO} '%%WWWDIR%%/LICENSE.md' >> ${PLIST}.new
 	${ECHO} '%%WWWDIR%%/README.md' >> ${PLIST}.new
 	${FIND} ${STAGEDIR}${PREFIX}/${WWWDIR}/webapps -type f -a ! -name \*.orig | ${SED} -e "s:${STAGEDIR}${PREFIX}/${WWWDIR}:%%WWWDIR%%:g" | ${SORT} >> ${PLIST}.new
 	${FIND} ${STAGEDIR}${PREFIX}/${WWWDIR}/etc -type f -a ! -name \*.orig | ${SED} -e "s:${STAGEDIR}${PREFIX}/${WWWDIR}:%%WWWDIR%%:g" | ${SORT} >> ${PLIST}.new
 	${ECHO} 'jetty_bastillion/etc' >> ${PLIST}.new
 
 .include <bsd.port.mk>
diff --git a/security/bastillion/files/bastillion.in b/security/bastillion/files/bastillion.in
index 2eb265413623..fed1b9cedefc 100644
--- a/security/bastillion/files/bastillion.in
+++ b/security/bastillion/files/bastillion.in
@@ -1,44 +1,50 @@
 #!/bin/sh
+#
+# $FreeBSD
+#
 
 # PROVIDE: bastillion
 # REQUIRE: NETWORKING SERVERS
 # KEYWORD: shutdown
 
 #
 # Add the following line to /etc/rc.conf to enable %%APP_NAME%%:
 #
 # %%APP_NAME%%_enable="YES"
 #
 
 . /etc/rc.subr
 
 name=%%APP_NAME%%
 rcvar=%%APP_NAME%%_enable
 
 command="%%PREFIX%%/jetty_%%APP_NAME%%/bin/jetty.sh"
 command_args="start"
 
 # set defaults
 
 %%APP_NAME%%_enable=${%%APP_NAME%%_enable:-"NO"}
 %%APP_NAME%%_user=${%%APP_NAME%%_user:-"www"}
 %%APP_NAME%%_group=${%%APP_NAME%%_group:-"www"}
 
 if [ ! -d /var/run/%%APP_NAME%% ]; then
 	mkdir -p /var/run/%%APP_NAME%%
 	chown www:www /var/run/%%APP_NAME%%
 fi
 
 load_rc_config ${name}
 
 if test -n "${%%APP_NAME%%_java_version}" ; then
     JAVA_HOME=$(JAVA_VERSION="${%%APP_NAME%%_java_version}" JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVA_HOME | cut -d= -f2)
     procname=$(JAVA_VERSION="${%%APP_NAME%%_java_version}" JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVAVM_PROG | cut -d= -f2)
 else
     JAVA_HOME=$(JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVA_HOME | cut -d= -f2)
     procname=$(JAVAVM_DRYRUN=1 %%LOCALBASE%%/bin/java | grep JAVAVM_PROG | cut -d= -f2)
 fi
 
 export JAVA_HOME
+LOG4J_FORMAT_MSG_NO_LOOKUPS=true
+export LOG4J_FORMAT_MSG_NO_LOOKUPS
+
 
 run_rc_command "$1"