diff --git a/sysutils/beats8/Makefile b/sysutils/beats8/Makefile
index 97059af22812..700919e12434 100644
--- a/sysutils/beats8/Makefile
+++ b/sysutils/beats8/Makefile
@@ -1,132 +1,132 @@
 PORTNAME=	beats
 DISTVERSIONPREFIX=	v
-DISTVERSION=	8.5.3
+DISTVERSION=	8.6.0
 CATEGORIES=	sysutils
 MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
 PKGNAMESUFFIX?=	8
 DISTFILES=	go.mod:gomod
 
 MAINTAINER=	elastic@FreeBSD.org
 COMMENT=	Send logs, network, metrics and heartbeat to elasticsearch or logstash
 WWW=		https://www.elastic.co/products/beats/
 
 LICENSE=	APACHE20
 
 USES=		go:modules
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	elastic
 
 USE_RC_SUBR=	${GO_TARGET:C,\./,,g}
 
 GO_MODULE=	github.com/elastic/beats/v8
 CGO_CFLAGS=	-I.
 CGO_LDFLAGS=	-L.
 MAKE_ENV+=	GOBUILD_FLAGS="-mod=vendor"
 
 CONFLICTS=	beats6 beats7
 
 PORTSCOUT=	limit:^8
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		AUDITBEAT FILEBEAT HEARTBEAT METRICBEAT PACKETBEAT
 OPTIONS_DEFAULT=	FILEBEAT HEARTBEAT METRICBEAT
 OPTIONS_SUB=		yes
 
 AUDITBEAT_DESC=			Auditbeat
 FILEBEAT_DESC=			Filebeat
 HEARTBEAT_DESC=			Heartbeat
 METRICBEAT_DESC=		Metricbeat
 PACKETBEAT_DESC=		Packetbeat
 AUDITBEAT_MASTER_SITES=		https://artifacts.elastic.co/downloads/beats/auditbeat/:auditbeat
 AUDITBEAT_DISTFILES=		auditbeat-${DISTVERSION}-darwin-x86_64.tar.gz:auditbeat
 AUDITBEAT_VARS=			GO_TARGET+=./auditbeat
 FILEBEAT_MASTER_SITES=		https://artifacts.elastic.co/downloads/beats/filebeat/:filebeat
 FILEBEAT_DISTFILES=		filebeat-${DISTVERSION}-darwin-x86_64.tar.gz:filebeat
 FILEBEAT_VARS=			GO_TARGET+=./filebeat
 HEARTBEAT_MASTER_SITES=		https://artifacts.elastic.co/downloads/beats/heartbeat/:heartbeat
 HEARTBEAT_DISTFILES=		heartbeat-${DISTVERSION}-darwin-x86_64.tar.gz:heartbeat
 HEARTBEAT_VARS=			GO_TARGET+=./heartbeat
 METRICBEAT_MASTER_SITES=	https://artifacts.elastic.co/downloads/beats/metricbeat/:metricbeat
 METRICBEAT_DISTFILES=		metricbeat-${DISTVERSION}-darwin-x86_64.tar.gz:metricbeat
 METRICBEAT_VARS=		GO_TARGET+=./metricbeat
 PACKETBEAT_MASTER_SITES=	https://artifacts.elastic.co/downloads/beats/packetbeat/:packetbeat
 PACKETBEAT_DISTFILES=		packetbeat-${DISTVERSION}-darwin-x86_64.tar.gz:packetbeat
 PACKETBEAT_VARS=		CGO_CFLAGS+=-I/usr/include \
 				CGO_LDFLAGS+=-L/usr/lib \
 				GO_TARGET+=./packetbeat
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e "s|%%BEATSVERSION%%|v${PORTVERSION}|g" ${WRKSRC}/dev-tools/mage/settings.go
 .for BEATMOD in ${GO_TARGET:C,\./,,g}
 	${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|g" ${WRKSRC}/${BEATMOD}/*.yml
 .endfor
 
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 .for BEATMOD in ${GO_TARGET:C,^\./,,g}
 	${MKDIR} ${STAGEDIR}/var/db/beats/${BEATMOD} && \
 	${INSTALL_PROGRAM} ${WRKDIR}/bin/${BEATMOD} \
 		${STAGEDIR}${PREFIX}/sbin && \
 	${INSTALL_DATA} ${WRKSRC}/${BEATMOD}/${BEATMOD}.yml \
 		${STAGEDIR}${ETCDIR}/${BEATMOD}.yml.sample && \
 	${INSTALL_DATA} ${WRKSRC}/${BEATMOD}/${BEATMOD}.reference.yml \
 		${STAGEDIR}${ETCDIR}/${BEATMOD}.yml.reference
 	(MODULE_SRC=${WRKDIR}/${BEATMOD}-${DISTVERSION}-darwin-x86_64/module; \
 	 if [ -d $${MODULE_SRC} ]; then \
 	   MODULE_DEST=${STAGEDIR}${DATADIR}/${BEATMOD}/module && \
 	   ${MKDIR} $${MODULE_DEST} && \
 	   cd $${MODULE_SRC} && ${COPYTREE_SHARE} . $${MODULE_DEST} && \
 	   cd $${MODULE_DEST} && \
 	   ${FIND} . -type d -empty | ${SORT} | \
 	   ${SED} -e 's,^\.,@dir ${DATADIR_REL}/${BEATMOD}/module,' >> ${TMPPLIST} && \
 	   ${FIND} . -not -type d | ${SORT} | \
 	   ${SED} -e 's,^\.,${DATADIR_REL}/${BEATMOD}/module,' >> ${TMPPLIST}; \
 	 fi) && \
 	(MODULESD_SRC=${WRKDIR}/${BEATMOD}-${DISTVERSION}-darwin-x86_64/modules.d; \
 	 if [ -d $${MODULESD_SRC} ]; then \
 	   MODULESD_DEST=${STAGEDIR}${EXAMPLESDIR}/${BEATMOD}.modules.d && \
 	   ${MKDIR} $${MODULESD_DEST} && \
 	   cd $${MODULESD_SRC} && ${COPYTREE_SHARE} . $${MODULESD_DEST} && \
 	   cd $${MODULESD_DEST} && \
 	   ${FIND} . -type d -empty | ${SORT} | \
 	   ${SED} -e 's,^\.,@dir ${EXAMPLESDIR_REL}/${BEATMOD}.modules.d,' >> ${TMPPLIST} && \
 	   ${FIND} . -not -type d | ${SORT} | \
 	   ${SED} -e 's,^\.,${EXAMPLESDIR_REL}/${BEATMOD}.modules.d,' >> ${TMPPLIST}; \
 	   ${MKDIR} ${STAGEDIR}${ETCDIR}/${BEATMOD}.modules.d && \
 	   ${ECHO_CMD} "The modules.d files are now in ${EXAMPLESDIR}/${BEATMOD}.modules.d" > \
 	     ${STAGEDIR}${ETCDIR}/${BEATMOD}.modules.d/README; \
 	   ${ECHO_CMD} ${ETCDIR_REL}/${BEATMOD}.modules.d/README >> ${TMPPLIST}; \
 	 fi) && \
 	(MONITORSD_SRC=${WRKDIR}/${BEATMOD}-${DISTVERSION}-darwin-x86_64/monitors.d; \
 	 if [ -d $${MONITORSD_SRC} ]; then \
 	   MONITORSD_DEST=${STAGEDIR}${EXAMPLESDIR}/${BEATMOD}.monitors.d && \
 	   ${MKDIR} $${MONITORSD_DEST} && \
 	   cd $${MONITORSD_SRC} && ${COPYTREE_SHARE} . $${MONITORSD_DEST} && \
 	   cd $${MONITORSD_DEST} && \
 	   ${FIND} . -type d -empty | ${SORT} | \
 	   ${SED} -e 's,^\.,@dir ${EXAMPLESDIR_REL}/${BEATMOD}.monitors.d,' >> ${TMPPLIST} && \
 	   ${FIND} . -not -type d | ${SORT} | \
 	   ${SED} -e 's,^\.,${EXAMPLESDIR_REL}/${BEATMOD}.monitors.d,' >> ${TMPPLIST}; \
 	   ${MKDIR} ${STAGEDIR}${ETCDIR}/${BEATMOD}.monitors.d && \
 	   ${ECHO_CMD} "The monitors.d files are now in ${EXAMPLESDIR}/${BEATMOD}.monitors.d" > \
 	     ${STAGEDIR}${ETCDIR}/${BEATMOD}.monitors.d/README; \
 	   ${ECHO_CMD} ${ETCDIR_REL}/${BEATMOD}.monitors.d/README >> ${TMPPLIST}; \
 	 fi) && \
 	(KIBANA_SRC=${WRKDIR}/${BEATMOD}-${DISTVERSION}-darwin-x86_64/kibana; \
 	 if [ -d $${KIBANA_SRC} ]; then \
 	   KIBANA_PATH=${STAGEDIR}${DATADIR}/${BEATMOD}/kibana; \
 	   ${MKDIR} $${KIBANA_PATH} && \
 	   cd $${KIBANA_SRC} && ${COPYTREE_SHARE} . $${KIBANA_PATH}; \
 	   cd $${KIBANA_PATH} && \
 	   ${FIND} . -type d -empty | ${SORT} | \
 	   ${SED} -e 's,^\.,@dir ${DATADIR_REL}/${BEATMOD}/kibana,' >> ${TMPPLIST}; \
 	   ${FIND} . -not -type d | ${SORT} | \
 	   ${SED} -e 's,^\.,${DATADIR_REL}/${BEATMOD}/kibana,' >> ${TMPPLIST}; \
 	 fi)
 .endfor
 
 .include <bsd.port.mk>
diff --git a/sysutils/beats8/distinfo b/sysutils/beats8/distinfo
index 60332e97c9ba..52d482e297fe 100644
--- a/sysutils/beats8/distinfo
+++ b/sysutils/beats8/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1670963724
-SHA256 (go/sysutils_beats8/elastic-beats-v8.5.3_GH0/go.mod) = 84517a983854e91447d7490754ef6a2bed61ada4991d59074b594c6d1caf1673
-SIZE (go/sysutils_beats8/elastic-beats-v8.5.3_GH0/go.mod) = 18960
-SHA256 (go/sysutils_beats8/elastic-beats-v8.5.3_GH0/auditbeat-8.5.3-darwin-x86_64.tar.gz) = e2c0bbedd96826537ac7690b133c463c297991269059ae1b3aca9b0b7838cacd
-SIZE (go/sysutils_beats8/elastic-beats-v8.5.3_GH0/auditbeat-8.5.3-darwin-x86_64.tar.gz) = 27861662
-SHA256 (go/sysutils_beats8/elastic-beats-v8.5.3_GH0/filebeat-8.5.3-darwin-x86_64.tar.gz) = 5f42ccc0842484adfc16ffbe4ba128b40aeb1d0ead6d5ddd0736daf2b48903d8
-SIZE (go/sysutils_beats8/elastic-beats-v8.5.3_GH0/filebeat-8.5.3-darwin-x86_64.tar.gz) = 36556823
-SHA256 (go/sysutils_beats8/elastic-beats-v8.5.3_GH0/heartbeat-8.5.3-darwin-x86_64.tar.gz) = 23bbba2fc8170c2a43bac1541ecc9e826c258634536dc8532a27c0064eb84117
-SIZE (go/sysutils_beats8/elastic-beats-v8.5.3_GH0/heartbeat-8.5.3-darwin-x86_64.tar.gz) = 27941024
-SHA256 (go/sysutils_beats8/elastic-beats-v8.5.3_GH0/metricbeat-8.5.3-darwin-x86_64.tar.gz) = 5f0bc66744434d5fa6c78093b48f977d85f6434f44383e10e1d75da011548f46
-SIZE (go/sysutils_beats8/elastic-beats-v8.5.3_GH0/metricbeat-8.5.3-darwin-x86_64.tar.gz) = 42950068
-SHA256 (go/sysutils_beats8/elastic-beats-v8.5.3_GH0/packetbeat-8.5.3-darwin-x86_64.tar.gz) = 8e42d65e0ce9b0319c4c203bdf1734621628474be51ad6052fd04ce61ed6a19c
-SIZE (go/sysutils_beats8/elastic-beats-v8.5.3_GH0/packetbeat-8.5.3-darwin-x86_64.tar.gz) = 29228037
-SHA256 (go/sysutils_beats8/elastic-beats-v8.5.3_GH0/elastic-beats-v8.5.3_GH0.tar.gz) = 1d270ca0869f560ad872b57ac21c101eb9523ded797ff063f3f8c760d1547a3b
-SIZE (go/sysutils_beats8/elastic-beats-v8.5.3_GH0/elastic-beats-v8.5.3_GH0.tar.gz) = 111496331
+TIMESTAMP = 1673471226
+SHA256 (go/sysutils_beats8/elastic-beats-v8.6.0_GH0/go.mod) = d0185a3bc0652af26a176c124f261e337766d999f178bcf3264db662be16edaa
+SIZE (go/sysutils_beats8/elastic-beats-v8.6.0_GH0/go.mod) = 19313
+SHA256 (go/sysutils_beats8/elastic-beats-v8.6.0_GH0/auditbeat-8.6.0-darwin-x86_64.tar.gz) = cc3517e4886129b74c51e34991ca10a216b81792e00ace1af8de083e394d5980
+SIZE (go/sysutils_beats8/elastic-beats-v8.6.0_GH0/auditbeat-8.6.0-darwin-x86_64.tar.gz) = 28081183
+SHA256 (go/sysutils_beats8/elastic-beats-v8.6.0_GH0/filebeat-8.6.0-darwin-x86_64.tar.gz) = cbba84252493ae2917a068483983e1760643c4f4f3d211d8d3891ce940c9fda9
+SIZE (go/sysutils_beats8/elastic-beats-v8.6.0_GH0/filebeat-8.6.0-darwin-x86_64.tar.gz) = 38014778
+SHA256 (go/sysutils_beats8/elastic-beats-v8.6.0_GH0/heartbeat-8.6.0-darwin-x86_64.tar.gz) = ff5cc80916474c5077222663686d75073518ba093bfb3402bfc30b55299e65e4
+SIZE (go/sysutils_beats8/elastic-beats-v8.6.0_GH0/heartbeat-8.6.0-darwin-x86_64.tar.gz) = 28008811
+SHA256 (go/sysutils_beats8/elastic-beats-v8.6.0_GH0/metricbeat-8.6.0-darwin-x86_64.tar.gz) = 95125323f07438beb0b73026b5e04580b5349a046dbd152c61e189ad5819fb83
+SIZE (go/sysutils_beats8/elastic-beats-v8.6.0_GH0/metricbeat-8.6.0-darwin-x86_64.tar.gz) = 43148701
+SHA256 (go/sysutils_beats8/elastic-beats-v8.6.0_GH0/packetbeat-8.6.0-darwin-x86_64.tar.gz) = 8b374a57863cb9d590705a451508a55120d9f1719d1ab848d0b5257bc7b9228e
+SIZE (go/sysutils_beats8/elastic-beats-v8.6.0_GH0/packetbeat-8.6.0-darwin-x86_64.tar.gz) = 29299065
+SHA256 (go/sysutils_beats8/elastic-beats-v8.6.0_GH0/elastic-beats-v8.6.0_GH0.tar.gz) = 6cc8a15d39d186f172967bab4d4af454128fafefee97a858d3dc500d86a369fd
+SIZE (go/sysutils_beats8/elastic-beats-v8.6.0_GH0/elastic-beats-v8.6.0_GH0.tar.gz) = 116462872