diff --git a/textproc/kibana6/Makefile b/textproc/kibana6/Makefile
index e87735a3376f..cefc2c390298 100644
--- a/textproc/kibana6/Makefile
+++ b/textproc/kibana6/Makefile
@@ -1,49 +1,49 @@
 # Created by: Tom Judge <tj@FreeBSD.org>
 
 PORTNAME=	kibana
-PORTVERSION=	6.8.13
+PORTVERSION=	6.8.15
 DISTVERSIONSUFFIX=	-darwin-x86_64
 CATEGORIES=	textproc www
 MASTER_SITES=	https://artifacts.elastic.co/downloads/kibana/ \
 		http://artifacts.elastic.co/downloads/kibana/
 PKGNAMESUFFIX?=	6
 
 MAINTAINER=	elastic@FreeBSD.org
 COMMENT=	Browser based analytics and search interface to ElasticSearch
 
 LICENSE=	APACHE20
 
 DEPRECATED=	Uses EOL Python 2.7 via www/node10
 EXPIRATION_DATE=2021-06-23
 
 RUN_DEPENDS=	node10>=10.15.2:www/node10
 
 CONFLICTS=	kibana[3-5]* kibana7*
 
 NO_BUILD=	yes
 WWWDIR=		${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX}
 USE_RC_SUBR=	${PORTNAME}
 
 SUB_FILES=	pkg-deinstall
 SUB_LIST+=	PORTNAME=${PORTNAME} PKGNAMESUFFIX=${PKGNAMESUFFIX}
 
 post-patch:
 	${FIND} -s ${WRKSRC}/node_modules -type d -empty -delete
 
 do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/config/kibana.yml ${STAGEDIR}${ETCDIR}/kibana.yml.sample
 	(cd ${WRKSRC} && \
 		${RM} -r config node optimize && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} && \
 		${COPYTREE_BIN} bin ${STAGEDIR}${WWWDIR})
 	${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${WWWDIR}/config
 
 post-install:
 	${ECHO} "@sample ${ETCDIR}/kibana.yml.sample" >> ${TMPPLIST}
 	${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	${ECHO} "@dir(www,www) ${WWWDIR}/data" >> ${TMPPLIST}
 	${ECHO} "@dir ${WWWDIR}/plugins" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/textproc/kibana6/distinfo b/textproc/kibana6/distinfo
index 54824d0a931e..724bbb170ebc 100644
--- a/textproc/kibana6/distinfo
+++ b/textproc/kibana6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1603569907
-SHA256 (kibana-6.8.13-darwin-x86_64.tar.gz) = c1a7bd89b5b337480f776d750bdeaa9292e563be8ac955a23425db328d858156
-SIZE (kibana-6.8.13-darwin-x86_64.tar.gz) = 185753717
+TIMESTAMP = 1617809013
+SHA256 (kibana-6.8.15-darwin-x86_64.tar.gz) = e387dd5de55dba2ef6c1df9867e1c8982e2e1e934019b75a6a29177860dbf406
+SIZE (kibana-6.8.15-darwin-x86_64.tar.gz) = 185725701
diff --git a/textproc/kibana6/files/kibana.in b/textproc/kibana6/files/kibana.in
index eae0485f5d44..2a581897d0a9 100644
--- a/textproc/kibana6/files/kibana.in
+++ b/textproc/kibana6/files/kibana.in
@@ -1,52 +1,53 @@
 #!/bin/sh
 
 # PROVIDE: kibana
 # REQUIRE: DAEMON
+# BEFORE: LOGIN
 # KEYWORD: shutdown
 
 . /etc/rc.subr
 
 name=kibana
 rcvar=kibana_enable
 
 load_rc_config $name
 
 : ${kibana_enable:="NO"}
 : ${kibana_config:="%%ETCDIR%%/kibana.yml"}
 : ${kibana_user:="www"}
 : ${kibana_group:="www"}
 : ${kibana_log:="/var/log/kibana.log"}
 
 export BABEL_DISABLE_CACHE=1
 export NODE_ENV=production
 # ml and reporting modules not supported on FreeBSD
 export XPACK_ML_ENABLED=false
 export XPACK_REPORTING_ENABLED=false
 
 required_files="${kibana_config}"
 pidfile="/var/run/${name}/${name}.pid"
 start_precmd="kibana_precmd"
 procname="%%LOCALBASE%%/bin/node"
 command="/usr/sbin/daemon"
 command_args="-f -p ${pidfile} ${procname} --no-warnings %%WWWDIR%%/src/cli serve --config ${kibana_config} --log-file ${kibana_log}"
 
 kibana_precmd()
 {
 	if [ ! -d $(dirname ${pidfile}) ]; then
 		install -d -o ${kibana_user} -g ${kibana_group} $(dirname ${pidfile})
 	fi
 
 	if [ ! -f ${kibana_log} ]; then
 		install -o ${kibana_user} -g ${kibana_group} -m 640 /dev/null ${kibana_log}
 	fi
 
 	if [ ! -d %%WWWDIR%%/optimize ]; then
 		install -d -o ${kibana_user} -g ${kibana_group} %%WWWDIR%%/optimize
 	else
 		# We may have installed a plugin as root which will cause files in here
 		# to be owned by root:wheel. Fix with a chown.
 		chown -R ${kibana_user}:${kibana_group} %%WWWDIR%%/optimize
 	fi
 }
 
 run_rc_command "$1"