diff --git a/sysutils/beats6/Makefile b/sysutils/beats6/Makefile
index c9ac40b515ff..2e592d1a30ab 100644
--- a/sysutils/beats6/Makefile
+++ b/sysutils/beats6/Makefile
@@ -1,71 +1,68 @@
-# Created by: Palle Girgensohn <girgen@FreeBSD.org>
-
 PORTNAME=	beats
-PORTVERSION=	6.8.15
-DISTVERSIONPREFIX=v
+PORTVERSION=	6.8.16
+DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	6
 
 MAINTAINER=	elastic@FreeBSD.org
 COMMENT=	Collect logs locally and send to remote logstash
 
 LICENSE=	APACHE20
 
 USES=		gmake go
 USE_GITHUB=	yes
 GH_ACCOUNT=	elastic
 USE_RC_SUBR=	${GO_TARGETS}
 
-CONFLICTS=	beats7*
-
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
-FIND_ARGS=	"! ( -regex .*/*\.(go|in|log) ) ! -path *test* ! -path *vendor*"
 MAKE_ENV+=	GOBUILD_FLAGS=""
 
-OPTIONS_DEFAULT=FILEBEAT HEARTBEAT METRICBEAT
-OPTIONS_DEFINE=	FILEBEAT HEARTBEAT METRICBEAT PACKETBEAT
-OPTIONS_SUB=	yes
+CONFLICTS=	beats7
 
-FILEBEAT_DESC=	Filebeat
-FILEBEAT_VARS=	GO_TARGETS+=filebeat
+OPTIONS_DEFINE=		FILEBEAT HEARTBEAT METRICBEAT PACKETBEAT
+OPTIONS_DEFAULT=	FILEBEAT HEARTBEAT METRICBEAT
+OPTIONS_SUB=		yes
 
-PACKETBEAT_DESC=Packetbeat
-PACKETBEAT_VARS=GO_TARGETS+=packetbeat
-PACKETBEAT_BROKEN=	An underlying library is currently broken under FreeBSD
+FILEBEAT_DESC=		Filebeat
+HEARTBEAT_DESC=		Heartbeat
+METRICBEAT_DESC=	Metricbeat
+PACKETBEAT_DESC=	Packetbeat
 
-METRICBEAT_DESC=Metricbeat
-METRICBEAT_VARS=GO_TARGETS+=metricbeat
+FILEBEAT_VARS=		GO_TARGETS+=filebeat
+HEARTBEAT_VARS=		GO_TARGETS+=heartbeat
+METRICBEAT_VARS=	GO_TARGETS+=metricbeat
+PACKETBEAT_BROKEN=	An underlying library is currently broken under FreeBSD
+PACKETBEAT_VARS=	GO_TARGETS+=packetbeat
 
-HEARTBEAT_DESC=	Heartbeat
-HEARTBEAT_VARS=	GO_TARGETS+=heartbeat
+_FIND_ARGS=	"! ( -regex .*/*\.(go|in|log) ) ! -path *test* ! -path *vendor*"
 
 .include <bsd.port.options.mk>
 
 do-build:
 .for GO_TARGET in ${GO_TARGETS}
 	@(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GMAKE} -C ${GO_TARGET})
 .endfor
 
 do-install:
 .for GO_TARGET in ${GO_TARGETS}
 	${INSTALL_PROGRAM} ${GO_WRKSRC}/${GO_TARGET}/${GO_TARGET} \
 		${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_DATA} ${WRKSRC}/${GO_TARGET}/${GO_TARGET}.yml \
 		${STAGEDIR}${PREFIX}/etc/${GO_TARGET}.yml.sample
 	(DEST_COMPONENT_PATH_UNSTAGED=/var/db/beats/${GO_TARGET}/kibana; \
 		DEST_COMPONENT_PATH=${STAGEDIR}$${DEST_COMPONENT_PATH_UNSTAGED}; \
 		${MKDIR} $${DEST_COMPONENT_PATH}; \
 		DASHBOARD_FIND_ARGS="-path */_meta/kibana -type d"; \
 		DASHBOARD_PATHS=$$(${SETENV} ${FIND} ${WRKSRC}/${GO_TARGET} $${DASHBOARD_FIND_ARGS}); \
 		for DASHBOARD_PATH in $${DASHBOARD_PATHS}; \
 		do \
 			(cd $${DASHBOARD_PATH} && ${COPYTREE_SHARE} . $${DEST_COMPONENT_PATH}); \
 		done)
 .endfor
 .for BEATMOD in filebeat metricbeat
 	${MKDIR} ${STAGEDIR}${ETCDIR}/${BEATMOD}.modules.d ${STAGEDIR}${DATADIR}/${BEATMOD}/module
-	(cd ${WRKSRC}/${BEATMOD}/module && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${BEATMOD}/module ${FIND_ARGS})
+	(cd ${WRKSRC}/${BEATMOD}/module && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${BEATMOD}/module ${_FIND_ARGS})
 	(cd ${WRKSRC}/${BEATMOD}/modules.d && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/${BEATMOD}.modules.d)
 .endfor
 
 .include <bsd.port.mk>
diff --git a/sysutils/beats6/distinfo b/sysutils/beats6/distinfo
index a2cf4eb7488e..79956e62d86f 100644
--- a/sysutils/beats6/distinfo
+++ b/sysutils/beats6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617794829
-SHA256 (elastic-beats-v6.8.15_GH0.tar.gz) = 92229c42685231a960f290fb6707f4c625abb60a49552ca20bcb75bb5cf8eab0
-SIZE (elastic-beats-v6.8.15_GH0.tar.gz) = 35585973
+TIMESTAMP = 1622123272
+SHA256 (elastic-beats-v6.8.16_GH0.tar.gz) = 2cdbcd6e454317fe4fa41555efcd3470fef5b120bb920fff2ae135f0b78195bc
+SIZE (elastic-beats-v6.8.16_GH0.tar.gz) = 35592988