diff --git a/sysutils/amazon-ssm-agent/Makefile b/sysutils/amazon-ssm-agent/Makefile
index 0c10138767f8..9bdd24ef864d 100644
--- a/sysutils/amazon-ssm-agent/Makefile
+++ b/sysutils/amazon-ssm-agent/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	amazon-ssm-agent
 PORTVERSION=	2.3.1205.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 
 MAINTAINER=	cperciva@FreeBSD.org
 COMMENT=	Amazon Simple Systems Manager Agent
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=	fails to build: vendor/golang.org/x/sys/unix/cap_freebsd.go:18:23: undefined: CAP_RIGHTS_VERSION_00
 
 RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 USES=		go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	aws
 GH_SUBDIR=	src/github.com/aws/amazon-ssm-agent
 
 GO_BUILDFLAGS=	-ldflags "-s -w"
 GO_TARGET=	./agent:${PREFIX}/sbin/amazon-ssm-agent \
 		./agent/framework/processor/executer/outofproc/worker:${PREFIX}/sbin/ssm-document-worker \
 		./agent/framework/processor/executer/outofproc/sessionworker:${PREFIX}/sbin/ssm-session-worker \
 		./agent/session/logging:${PREFIX}/sbin/ssm-session-logger \
 		./agent/cli-main:${PREFIX}/sbin/ssm-cli
 
 PLIST_FILES=	etc/amazon/ssm/amazon-ssm-agent.json.template	\
 		etc/amazon/ssm/seelog_unix.xml.template		\
 		sbin/amazon-ssm-agent				\
 		sbin/ssm-document-worker			\
 		sbin/ssm-session-worker				\
 		sbin/ssm-session-logger				\
 		sbin/ssm-cli
 
 USE_RC_SUBR=	amazon-ssm-agent
 
 post-patch:
 	${LN} -s ${WRKSRC}/vendor/src/* ${WRKSRC}/vendor/
 
 pre-build:
 # set package version
 	cd ${GO_WRKSRC} && BRAZIL_PACKAGE_VERSION=${PORTVERSION} \
 	${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} run ./agent/version/versiongenerator/version-gen.go
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/amazon/ssm
 	${INSTALL_DATA} ${WRKSRC}/amazon-ssm-agent.json.template ${STAGEDIR}${PREFIX}/etc/amazon/ssm
 	${INSTALL_DATA} ${WRKSRC}/seelog_unix.xml ${STAGEDIR}${PREFIX}/etc/amazon/ssm/seelog_unix.xml.template
 
 .include <bsd.port.mk>
diff --git a/sysutils/amazon-ssm-agent/files/amazon-ssm-agent.in b/sysutils/amazon-ssm-agent/files/amazon-ssm-agent.in
index b0b8fc96185e..b4ffe6487d13 100644
--- a/sysutils/amazon-ssm-agent/files/amazon-ssm-agent.in
+++ b/sysutils/amazon-ssm-agent/files/amazon-ssm-agent.in
@@ -1,25 +1,26 @@
 #!/bin/sh
 
 # PROVIDE: amazon-ssm-agent
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # amazon_ssm_agent_enable:	Set to YES to enable the Amazon SSM Agent
 
 . /etc/rc.subr
 
 name="amazon_ssm_agent"
 rcvar=amazon_ssm_agent_enable
 
 load_rc_config $name
 
 : ${amazon_ssm_agent_enable="NO"}
+: ${amazon_ssm_agent_env="PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:/home/ssm-user/bin"}
 
 pidfile="/var/run/${name}.pid"
 command="/usr/sbin/daemon"
 command_args="-f -P ${pidfile} %%PREFIX%%/sbin/amazon-ssm-agent"
 
 run_rc_command "$1"