diff --git a/sysutils/pxp-agent/Makefile b/sysutils/pxp-agent/Makefile
index a04e2121b901..8f89f96ab35b 100644
--- a/sysutils/pxp-agent/Makefile
+++ b/sysutils/pxp-agent/Makefile
@@ -1,24 +1,26 @@
 PORTNAME=	pxp-agent
-PORTVERSION=	1.15.11
+PORTVERSION=	1.15.12
 CATEGORIES=	sysutils
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	PCP eXecution Protocol Agent
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	liblibcpp-pcp-client.so:net/cpp-pcp-client \
 		libboost_thread.so:devel/boost-libs \
 		liblibcpp-hocon.so:devel/cpp-hocon \
 		libleatherman_util.so:devel/leatherman
 
-USES=		cmake ssl
+USES=		cmake shebangfix ssl
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	puppetlabs
 
 CMAKE_OFF=	ENABLE_CXX_WERROR
 LDFLAGS+=	-lthr
+SHEBANG_FILES=	exe/apply_ruby_shim.rb
+ruby_OLD_CMD=	/opt/puppetlabs/puppet/bin/ruby
 
 .include <bsd.port.mk>
diff --git a/sysutils/pxp-agent/distinfo b/sysutils/pxp-agent/distinfo
index c2c5facdea2f..be7562303a68 100644
--- a/sysutils/pxp-agent/distinfo
+++ b/sysutils/pxp-agent/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1621202732
-SHA256 (puppetlabs-pxp-agent-1.15.11_GH0.tar.gz) = 43ef13199f461c15df6526bdf07cda11a17dd40ae471b7055574c2ad18690def
-SIZE (puppetlabs-pxp-agent-1.15.11_GH0.tar.gz) = 318528
+TIMESTAMP = 1622223416
+SHA256 (puppetlabs-pxp-agent-1.15.12_GH0.tar.gz) = 7087c4eba6a44072d055f2098cfeff284fd9d679ba25dd0aff227e41f5b2b489
+SIZE (puppetlabs-pxp-agent-1.15.12_GH0.tar.gz) = 318278
diff --git a/sysutils/pxp-agent/pkg-plist b/sysutils/pxp-agent/pkg-plist
index a0b9122b265a..26dc8dcdeb16 100644
--- a/sysutils/pxp-agent/pkg-plist
+++ b/sysutils/pxp-agent/pkg-plist
@@ -1,6 +1,7 @@
 bin/PowershellShim-Helper.ps1
 bin/PowershellShim.ps1
+bin/apply_ruby_shim.rb
 bin/execution_wrapper
 bin/pxp-agent
 lib/libpxp-agent.a
 pxp-agent/modules/pxp-module-puppet