diff --git a/sysutils/beats8/Makefile b/sysutils/beats8/Makefile
index 85876f53a786..435001aa4c7f 100644
--- a/sysutils/beats8/Makefile
+++ b/sysutils/beats8/Makefile
@@ -1,133 +1,132 @@
 PORTNAME=	beats
 DISTVERSIONPREFIX=	v
-DISTVERSION=	8.6.2
-PORTREVISION=	2
+DISTVERSION=	8.7.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 a33827cc9202..bea1b6c02e36 100644
--- a/sysutils/beats8/distinfo
+++ b/sysutils/beats8/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1677240532
-SHA256 (go/sysutils_beats8/elastic-beats-v8.6.2_GH0/go.mod) = 92e38384c7a66ef050b2a15fdbd97b39852a10ad811862006b52801dabaa77fa
-SIZE (go/sysutils_beats8/elastic-beats-v8.6.2_GH0/go.mod) = 19313
-SHA256 (go/sysutils_beats8/elastic-beats-v8.6.2_GH0/auditbeat-8.6.2-darwin-x86_64.tar.gz) = 76267b88820cf391656ccc4c70ba8b8a126d3d07821606e6101673448bbc387c
-SIZE (go/sysutils_beats8/elastic-beats-v8.6.2_GH0/auditbeat-8.6.2-darwin-x86_64.tar.gz) = 28079940
-SHA256 (go/sysutils_beats8/elastic-beats-v8.6.2_GH0/filebeat-8.6.2-darwin-x86_64.tar.gz) = 5bc7c0cd4bd81e312c75fb410fe4baac9f05a038c871aa4f75ddfd44abb798ae
-SIZE (go/sysutils_beats8/elastic-beats-v8.6.2_GH0/filebeat-8.6.2-darwin-x86_64.tar.gz) = 38018527
-SHA256 (go/sysutils_beats8/elastic-beats-v8.6.2_GH0/heartbeat-8.6.2-darwin-x86_64.tar.gz) = 7d7ff9dabab8ab7c9bfba0d5a06462fafe541be28ed01dee399d6c0ff6440bdc
-SIZE (go/sysutils_beats8/elastic-beats-v8.6.2_GH0/heartbeat-8.6.2-darwin-x86_64.tar.gz) = 28007447
-SHA256 (go/sysutils_beats8/elastic-beats-v8.6.2_GH0/metricbeat-8.6.2-darwin-x86_64.tar.gz) = 826971a80db972f908985b5dcef56b43071314348adbafd250c5e31c91169e78
-SIZE (go/sysutils_beats8/elastic-beats-v8.6.2_GH0/metricbeat-8.6.2-darwin-x86_64.tar.gz) = 43178762
-SHA256 (go/sysutils_beats8/elastic-beats-v8.6.2_GH0/packetbeat-8.6.2-darwin-x86_64.tar.gz) = b22fd61a068dcf5bcf8b9a044b59f42020921db186000dbed76f5a344ea13b79
-SIZE (go/sysutils_beats8/elastic-beats-v8.6.2_GH0/packetbeat-8.6.2-darwin-x86_64.tar.gz) = 29300607
-SHA256 (go/sysutils_beats8/elastic-beats-v8.6.2_GH0/elastic-beats-v8.6.2_GH0.tar.gz) = e1862ad858376ff7affc5b2311b692e9bdd997b8a0db91b8912b09720453dbab
-SIZE (go/sysutils_beats8/elastic-beats-v8.6.2_GH0/elastic-beats-v8.6.2_GH0.tar.gz) = 116496006
+TIMESTAMP = 1682975938
+SHA256 (go/sysutils_beats8/elastic-beats-v8.7.0_GH0/go.mod) = 507b66a023a4d8c24653e5758d490388aa3ee50970ed2b68e9cd5a307b105e3c
+SIZE (go/sysutils_beats8/elastic-beats-v8.7.0_GH0/go.mod) = 19375
+SHA256 (go/sysutils_beats8/elastic-beats-v8.7.0_GH0/auditbeat-8.7.0-darwin-x86_64.tar.gz) = d7598c6b14d184642228543da448c38eb1dd6cb306490039eefd9d086825b48f
+SIZE (go/sysutils_beats8/elastic-beats-v8.7.0_GH0/auditbeat-8.7.0-darwin-x86_64.tar.gz) = 28335377
+SHA256 (go/sysutils_beats8/elastic-beats-v8.7.0_GH0/filebeat-8.7.0-darwin-x86_64.tar.gz) = d13d1863783199eceef4dbd92b83f19f45d41eb0da42d1766202c8b8df6c1bdf
+SIZE (go/sysutils_beats8/elastic-beats-v8.7.0_GH0/filebeat-8.7.0-darwin-x86_64.tar.gz) = 38609009
+SHA256 (go/sysutils_beats8/elastic-beats-v8.7.0_GH0/heartbeat-8.7.0-darwin-x86_64.tar.gz) = caf845a0e35e088c5ceebf8d5e23f1621c2a30ff72dbb421ae756b1f936d42d5
+SIZE (go/sysutils_beats8/elastic-beats-v8.7.0_GH0/heartbeat-8.7.0-darwin-x86_64.tar.gz) = 28268505
+SHA256 (go/sysutils_beats8/elastic-beats-v8.7.0_GH0/metricbeat-8.7.0-darwin-x86_64.tar.gz) = 7a2f22cd730f0188b36bfe91bc0afa78476e8bb6adcb5776318153dcb4b99681
+SIZE (go/sysutils_beats8/elastic-beats-v8.7.0_GH0/metricbeat-8.7.0-darwin-x86_64.tar.gz) = 43667121
+SHA256 (go/sysutils_beats8/elastic-beats-v8.7.0_GH0/packetbeat-8.7.0-darwin-x86_64.tar.gz) = 3ca14f00c467f9590c9e684e3ae7d76a4c7f4158d37af4c8f4ec27fb07dea65b
+SIZE (go/sysutils_beats8/elastic-beats-v8.7.0_GH0/packetbeat-8.7.0-darwin-x86_64.tar.gz) = 29614945
+SHA256 (go/sysutils_beats8/elastic-beats-v8.7.0_GH0/elastic-beats-v8.7.0_GH0.tar.gz) = 7ed3a922201a3169619ad7acb6ad2749e3541e367ea33948c2028f1a76f56431
+SIZE (go/sysutils_beats8/elastic-beats-v8.7.0_GH0/elastic-beats-v8.7.0_GH0.tar.gz) = 116462417
diff --git a/sysutils/beats8/files/pkg-message.in b/sysutils/beats8/files/pkg-message.in
index d774668512dc..8f59c61118ca 100644
--- a/sysutils/beats8/files/pkg-message.in
+++ b/sysutils/beats8/files/pkg-message.in
@@ -1,12 +1,10 @@
 [
 { type: install
   message: <<EOM
 The modules.d and monitors.d files are now installed into
 %%EXAMPLESDIR%%
 
-See README file in %%ETCDIR%% for respective beat information.
-
 See UPDATING file in ports top level directory for list of breaking changes.
 EOM
 }
 ]