diff --git a/sysutils/puppet8/Makefile b/sysutils/puppet8/Makefile
index 620320b31592..ce96cd519e0e 100644
--- a/sysutils/puppet8/Makefile
+++ b/sysutils/puppet8/Makefile
@@ -1,128 +1,127 @@
 PORTNAME=	puppet
-PORTVERSION=	8.6.0
+PORTVERSION=	8.7.0
 CATEGORIES=	sysutils
 MASTER_SITES=   https://forge.puppet.com/v3/files/:forge
 PKGNAMESUFFIX=	8
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	Configuration management framework written in Ruby
 WWW=		https://puppet.com/docs/puppet/latest/puppet_index.html
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	rubygem-concurrent-ruby>1.0:devel/rubygem-concurrent-ruby \
 		rubygem-deep_merge>1.0:devel/rubygem-deep_merge \
 		rubygem-facter>=4.0:sysutils/rubygem-facter \
 		rubygem-fast_gettext>=2.1:devel/rubygem-fast_gettext \
 		rubygem-locale>=2.1:devel/rubygem-locale \
 		rubygem-multi_json>=1.10:devel/rubygem-multi_json \
 		rubygem-puppet-resource_api>=1.5:devel/rubygem-puppet-resource_api \
 		rubygem-ruby-augeas>=0:textproc/rubygem-ruby-augeas \
 		rubygem-scanf>=1:devel/rubygem-scanf \
 		rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet
 
 USES=		cpe ruby
 USE_GITHUB=	yes
 GH_ACCOUNT=	puppetlabs
 
 CONFLICTS_INSTALL=	puppet[0-9]
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 NO_ARCH=	yes
 NO_BUILD=	yes
 USE_RC_SUBR=	puppet
 PORTDOCS=	LICENSE README.md
 PORTEXAMPLES=	*
 USERS=		puppet
 GROUPS=		puppet
 SUB_FILES+=	pkg-message
 SUB_LIST=	RUBY=${RUBY}
 
 OPTIONS_DEFINE=		DOCS EXAMPLES
 
 # Get versions from
 # https://github.com/puppetlabs/puppet-agent/tree/main/configs/components
 # for f in configs/components/module-puppetlabs-*.json; do echo ${${f#*/module-puppetlabs-}%.json}=${${$(jq .ref $f)#*/v}%\"}; done
 FORGE_MODULES=	augeas_core=1.5.0 \
 		cron_core=1.3.0 \
 		host_core=1.3.0 \
 		mount_core=1.3.0 \
 		scheduled_task=3.2.0 \
 		selinux_core=1.4.0 \
 		sshkeys_core=2.5.0 \
 		yumrepo_core=2.1.0 \
 		zfs_core=1.5.0 \
 		zone_core=1.2.0
 
 .for module in ${FORGE_MODULES}
 DISTFILES+=	puppetlabs-${module:C/=.*//}-${module:C/.*=//}.tar.gz:forge
 .endfor
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/etc/puppetlabs/puppet|${ETCDIR}|" \
 		${WRKSRC}/install.rb \
-		${WRKSRC}/lib/puppet/reference/configuration.rb \
-		${WRKSRC}/lib/puppet/util/run_mode.rb
+		${WRKSRC}/lib/puppet/reference/configuration.rb
 	@${REINPLACE_CMD} -e "s|/etc/puppetlabs/code|${ETCDIR}|" \
 		${WRKSRC}/install.rb \
 		${WRKSRC}/lib/puppet/reference/configuration.rb \
 		${WRKSRC}/lib/puppet/util/run_mode.rb
 	@${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/cache|/var/puppet|" \
 		${WRKSRC}/install.rb \
 		${WRKSRC}/lib/puppet/reference/configuration.rb \
 		${WRKSRC}/lib/puppet/util/run_mode.rb
 	@${REINPLACE_CMD} -e "s|/var/run/puppetlabs|/var/run/puppet|" \
 		${WRKSRC}/install.rb \
 		${WRKSRC}/lib/puppet/util/run_mode.rb
 	@${REINPLACE_CMD} -e "s|/var/log/puppetlabs/puppet|/var/log/puppet|" \
 		${WRKSRC}/install.rb \
 		${WRKSRC}/lib/puppet/util/run_mode.rb
 	@${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/public|/var/puppet/state|" \
 		${WRKSRC}/install.rb \
 		${WRKSRC}/lib/puppet/util/run_mode.rb
 	@${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/modules|${ETCDIR}/modules|" \
 		-e "s|/etc/puppetlabs/puppetserver/ca|/var/puppetserver/ca|" \
 		-e "s|/opt/puppetlabs/puppet/vendor_modules|${ETCDIR}/vendor_modules|" \
 		${WRKSRC}/lib/puppet/defaults.rb
 	@${REINPLACE_CMD} -e "s|/opt/puppetlabs/puppet/bin/gem|${LOCALBASE}/bin/gem|" \
 		${WRKSRC}/lib/puppet/provider/package/puppet_gem.rb
 	@${REINPLACE_CMD} -e "s|\$$confdir/ssl|/var/puppet/ssl|" \
 		${WRKSRC}/lib/puppet/defaults.rb
 	@${REINPLACE_CMD} -e "s|\.\./\.\./\.\./locales|../locales|" \
 		${WRKSRC}/lib/puppet/gettext/config.rb
 
 do-install:
 	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} LC_ALL=C.UTF-8 ${RUBY} ${WRKSRC}/install.rb --no-configs --destdir=${STAGEDIR} \
 		--localedir=${RUBY_SITELIBDIR}/puppet/locales --publicdir=/var/puppet/state/
 
 post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}/manifests
 	${MKDIR} ${STAGEDIR}${ETCDIR}/modules
 	${MKDIR} ${STAGEDIR}${ETCDIR}/vendor_modules
 .for module in ${FORGE_MODULES}
 	(cd ${WRKDIR}/puppetlabs-${module:C/=.*//}-${module:C/.*=//} && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/vendor_modules/${module:C/=.*//})
 .endfor
 	${MKDIR} ${STAGEDIR}/var/puppet
 	${SETENV} LC_ALL=C.UTF-8 ${RUBY} -I ${STAGEDIR}/${RUBY_SITELIBDIR} ${STAGEDIR}${PREFIX}/bin/puppet agent --genconfig \
 		--confdir=${ETCDIR} \
 		--rundir=/var/run/puppet \
 		--vardir=/var/puppet \
 		--logdir=/var/log/puppet \
 		--codedir=${ETCDIR} \
 		> ${STAGEDIR}${ETCDIR}/puppet.conf-dist
 	@${ECHO} ${STAGEDIR}${RUBY_SITELIBDIR}/puppet.rb | \
 		${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
 	@${FIND} ${STAGEDIR}${RUBY_SITELIBDIR}/${PORTNAME} -type f | \
 		${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/specifications
-	${INSTALL_DATA} ${WRKSRC}/.gemspec ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/specifications/${PORTNAME}-${PORTVERSION}.gemspec
+	${INSTALL_DATA} ${WRKSRC}/puppet.gemspec ${STAGEDIR}${PREFIX}/lib/ruby/gems/${RUBY_VER}/specifications/${PORTNAME}-${PORTVERSION}.gemspec
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/puppet8/distinfo b/sysutils/puppet8/distinfo
index 5066561b8956..49f303463f11 100644
--- a/sysutils/puppet8/distinfo
+++ b/sysutils/puppet8/distinfo
@@ -1,23 +1,23 @@
-TIMESTAMP = 1713224806
+TIMESTAMP = 1718150284
 SHA256 (puppetlabs-augeas_core-1.5.0.tar.gz) = 470406981b7638869acb4ecc75e2fd079b5999b5aeeb8324b9b475fe07bca935
 SIZE (puppetlabs-augeas_core-1.5.0.tar.gz) = 26311
 SHA256 (puppetlabs-cron_core-1.3.0.tar.gz) = 2a7be4004acc3881357b2e11db1a8937f4d64d37d8ce38872cefe1c7c4a2a6ef
 SIZE (puppetlabs-cron_core-1.3.0.tar.gz) = 26051
 SHA256 (puppetlabs-host_core-1.3.0.tar.gz) = 3583352bf60cb9013907b880868c1eeee053d2dd647a4f9e388a34cba373622d
 SIZE (puppetlabs-host_core-1.3.0.tar.gz) = 15862
 SHA256 (puppetlabs-mount_core-1.3.0.tar.gz) = 5924b9e974f6fa592cea29cbe93a07b5d7e08bbf2e98145f7ae7157305946b4a
 SIZE (puppetlabs-mount_core-1.3.0.tar.gz) = 22751
 SHA256 (puppetlabs-scheduled_task-3.2.0.tar.gz) = 9f0ba59b55caadeb658ba2d5cc51f0a76136d4bb5fffe008bbd5c911b42ac43f
 SIZE (puppetlabs-scheduled_task-3.2.0.tar.gz) = 44882
 SHA256 (puppetlabs-selinux_core-1.4.0.tar.gz) = 140e41c1ab4c0523b46b0e89f3316945ae4b5328e661da87aebfc33628d92b57
 SIZE (puppetlabs-selinux_core-1.4.0.tar.gz) = 17751
 SHA256 (puppetlabs-sshkeys_core-2.5.0.tar.gz) = b67365307a2b21c1ba2ecf444c3e4895244559d8c5bd40cc2ead4d33fe27cd11
 SIZE (puppetlabs-sshkeys_core-2.5.0.tar.gz) = 20562
 SHA256 (puppetlabs-yumrepo_core-2.1.0.tar.gz) = 32e78df32121fa65312f0948f614dab8c7414ccfedbc5e2c70a8cf468fe89cbe
 SIZE (puppetlabs-yumrepo_core-2.1.0.tar.gz) = 22146
 SHA256 (puppetlabs-zfs_core-1.5.0.tar.gz) = 54ddfee4aeea028ed4269cd9ffd89f8491cb5720a67d5f34dcb9bd7e3a87b079
 SIZE (puppetlabs-zfs_core-1.5.0.tar.gz) = 20163
 SHA256 (puppetlabs-zone_core-1.2.0.tar.gz) = 7c722015b3d16b6a48bec1b6f79dd7369cfd0de70731f17b94c27553f7e08096
 SIZE (puppetlabs-zone_core-1.2.0.tar.gz) = 22000
-SHA256 (puppetlabs-puppet-8.6.0_GH0.tar.gz) = b9b9f393271d946c29786edab92209d1e3357f06adafdd30dd16aba10851079d
-SIZE (puppetlabs-puppet-8.6.0_GH0.tar.gz) = 3328678
+SHA256 (puppetlabs-puppet-8.7.0_GH0.tar.gz) = ace755cfea186cb20a4001508d11c21b57457c5ee01e85e85e27db5c539c2792
+SIZE (puppetlabs-puppet-8.7.0_GH0.tar.gz) = 3330348