diff --git a/textproc/kibana6/Makefile b/textproc/kibana6/Makefile
index cefc2c390298..54b2d67dc486 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.15
+PORTVERSION=	6.8.16
 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
+EXPIRATION_DATE=	2021-06-23
 
 RUN_DEPENDS=	node10>=10.15.2:www/node10
 
-CONFLICTS=	kibana[3-5]* kibana7*
+USE_RC_SUBR=	${PORTNAME}
+
+CONFLICTS=	kibana7* kibana[3-5]*
 
-NO_BUILD=	yes
 WWWDIR=		${PREFIX}/www/${PORTNAME}${PKGNAMESUFFIX}
-USE_RC_SUBR=	${PORTNAME}
 
+NO_BUILD=	yes
 SUB_FILES=	pkg-deinstall
-SUB_LIST+=	PORTNAME=${PORTNAME} PKGNAMESUFFIX=${PKGNAMESUFFIX}
+SUB_LIST+=	PKGNAMESUFFIX=${PKGNAMESUFFIX} \
+		PORTNAME=${PORTNAME}
 
 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 724bbb170ebc..af575da7f1ae 100644
--- a/textproc/kibana6/distinfo
+++ b/textproc/kibana6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617809013
-SHA256 (kibana-6.8.15-darwin-x86_64.tar.gz) = e387dd5de55dba2ef6c1df9867e1c8982e2e1e934019b75a6a29177860dbf406
-SIZE (kibana-6.8.15-darwin-x86_64.tar.gz) = 185725701
+TIMESTAMP = 1622128053
+SHA256 (kibana-6.8.16-darwin-x86_64.tar.gz) = 17c68920377862467bfad65f336e6ccbc4157ca69eab9300a20f8b7b562365a4
+SIZE (kibana-6.8.16-darwin-x86_64.tar.gz) = 183046158