diff --git a/sysutils/puppet8/Makefile b/sysutils/puppet8/Makefile
index 1f87bd1faf13..cc3ab9ce10aa 100644
--- a/sysutils/puppet8/Makefile
+++ b/sysutils/puppet8/Makefile
@@ -1,130 +1,130 @@
 PORTNAME=	puppet
-PORTVERSION=	8.0.1
+PORTVERSION=	8.1.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
 
 BROKEN_RUBY30=	yes
 
-RUN_DEPENDS=	rubygem-concurrent-ruby11>1.0:devel/rubygem-concurrent-ruby11 \
+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.3.0 \
 		cron_core=1.2.0 \
 		host_core=1.2.0 \
 		mount_core=1.2.0 \
 		scheduled_task=3.1.1 \
 		selinux_core=1.3.0 \
 		sshkeys_core=2.4.0 \
 		yumrepo_core=1.2.0 \
 		zfs_core=1.4.0 \
 		zone_core=1.1.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
 	@${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
 
 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 a731999bd878..b0e75b9cf582 100644
--- a/sysutils/puppet8/distinfo
+++ b/sysutils/puppet8/distinfo
@@ -1,23 +1,23 @@
-TIMESTAMP = 1682716159
+TIMESTAMP = 1686975613
 SHA256 (puppetlabs-augeas_core-1.3.0.tar.gz) = be41ae163f5dc94021ce03c2a0032a23275b4378af3c917befc12af14a4b3b69
 SIZE (puppetlabs-augeas_core-1.3.0.tar.gz) = 25837
 SHA256 (puppetlabs-cron_core-1.2.0.tar.gz) = e74247784d8cf6b27811b98f3ad782952d0005e4e012abb367d3492c51f264a2
 SIZE (puppetlabs-cron_core-1.2.0.tar.gz) = 24594
 SHA256 (puppetlabs-host_core-1.2.0.tar.gz) = a45d7fed47ae1c707fabaec9a1d6da4d8e2fd23bcfb998e6406b4c8e2eed056e
 SIZE (puppetlabs-host_core-1.2.0.tar.gz) = 14471
 SHA256 (puppetlabs-mount_core-1.2.0.tar.gz) = ed437a07e9457fac21e1c87e53b44b7cf4f98c4d5e509dd5ffdea6c5dd96c6ee
 SIZE (puppetlabs-mount_core-1.2.0.tar.gz) = 21556
 SHA256 (puppetlabs-scheduled_task-3.1.1.tar.gz) = d1993b1b41b63f224594ad6fe84c92449fbf2a96afee6f8cd604562c57e76e05
 SIZE (puppetlabs-scheduled_task-3.1.1.tar.gz) = 45065
 SHA256 (puppetlabs-selinux_core-1.3.0.tar.gz) = 593ad4cc9d311528b6be0fdaa6ce08bf46acb21ff0d035ef3c6f2e548c43433d
 SIZE (puppetlabs-selinux_core-1.3.0.tar.gz) = 16456
 SHA256 (puppetlabs-sshkeys_core-2.4.0.tar.gz) = 033eb694359974ce1d9154526f42a01c2bc64abbcd4f587a5f25dff03135171b
 SIZE (puppetlabs-sshkeys_core-2.4.0.tar.gz) = 20091
 SHA256 (puppetlabs-yumrepo_core-1.2.0.tar.gz) = 6fd02331be8267165e75c4eb00030a88be4401fe8d4eeea45365cc270140f44a
 SIZE (puppetlabs-yumrepo_core-1.2.0.tar.gz) = 19704
 SHA256 (puppetlabs-zfs_core-1.4.0.tar.gz) = fcdf3440d5cf5e76a2ae452fc8eb6b8a589721e7c5a8832c2984e60f1962d5fa
 SIZE (puppetlabs-zfs_core-1.4.0.tar.gz) = 18834
 SHA256 (puppetlabs-zone_core-1.1.0.tar.gz) = 9d8241938e56145ce15827415e5c6b74002407b4548c12b5ef165423adfc725b
 SIZE (puppetlabs-zone_core-1.1.0.tar.gz) = 20637
-SHA256 (puppetlabs-puppet-8.0.1_GH0.tar.gz) = 3cd03a87274bdd80b466dbd33c0a45e435dc4d02a84106d13fae0c246c73adb1
-SIZE (puppetlabs-puppet-8.0.1_GH0.tar.gz) = 3317153
+SHA256 (puppetlabs-puppet-8.1.0_GH0.tar.gz) = 126366f58828aca9ad76d77681ffbb38553157bfcf6f0c8bd8302aef83c3f437
+SIZE (puppetlabs-puppet-8.1.0_GH0.tar.gz) = 3318367
diff --git a/sysutils/puppet8/files/patch-lib_puppet_settings.rb b/sysutils/puppet8/files/patch-lib_puppet_settings.rb
deleted file mode 100644
index 333f545c291f..000000000000
--- a/sysutils/puppet8/files/patch-lib_puppet_settings.rb
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/puppet/settings.rb.orig	2023-04-08 20:42:13 UTC
-+++ lib/puppet/settings.rb
-@@ -4,6 +4,7 @@ require_relative '../puppet/util/watched_file'
- require_relative '../puppet/util/command_line/puppet_option_parser'
- require 'forwardable'
- require 'fileutils'
-+gem 'concurrent-ruby', '< 1.2.0'
- require 'concurrent'
- 
- # The class for handling configuration files.
diff --git a/sysutils/puppet8/files/patch-lib_puppet_thread__local.rb b/sysutils/puppet8/files/patch-lib_puppet_thread__local.rb
deleted file mode 100644
index 8a2598647e42..000000000000
--- a/sysutils/puppet8/files/patch-lib_puppet_thread__local.rb
+++ /dev/null
@@ -1,7 +0,0 @@
---- lib/puppet/thread_local.rb.orig	2023-04-08 20:42:06 UTC
-+++ lib/puppet/thread_local.rb
-@@ -1,3 +1,4 @@
-+gem 'concurrent-ruby', '< 1.2.0'
- require 'concurrent'
- 
- # We want to use the pure Ruby implementation even on JRuby. If we use the Java