diff --git a/devel/buildkite-agent/Makefile b/devel/buildkite-agent/Makefile
index 6ed849bfb126..1329012e2d04 100644
--- a/devel/buildkite-agent/Makefile
+++ b/devel/buildkite-agent/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	buildkite-agent
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.95.0
+DISTVERSION=	3.97.0
 CATEGORIES=	devel sysutils
 
 MAINTAINER=	dch@FreeBSD.org
 COMMENT=	Cross-platform build runner to run your own build tasks
 WWW=		https://buildkite.com/
 
 LICENSE=	APACHE20 BSD2CLAUSE BSD3CLAUSE LGPL3 MIT
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		go:1.24,modules
 
 GO_MODULE=	github.com/buildkite/agent/v3
 GO_ENV+=	GOTOOLCHAIN=local+path
 
 USE_RC_SUBR=	buildkite
 
 ETCDIR=		${PREFIX}/etc/buildkite
 
 SUB_FILES=	pkg-message
 
 post-patch:
 	${REINPLACE_CMD} -I '' -e 's|/bin/bash|${LOCALBASE}/bin/bash|g' \
 			${WRKSRC}/packaging/linux/scripts/*.sh \
 			${WRKSRC}/packaging/linux/root/usr/share/buildkite-agent/*.sh
 
 do-install:
 	${INSTALL_PROGRAM} \
 		${WRKDIR}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${ETCDIR}/hooks ${STAGEDIR}${ETCDIR}/plugins
 	${INSTALL_DATA} \
 		${WRKSRC}/packaging/github/linux/${PORTNAME}.cfg \
 		${STAGEDIR}${ETCDIR}/${PORTNAME}.cfg.sample
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/packaging/linux/root/usr/share/${PORTNAME} && ${COPYTREE_SHARE} hooks ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/buildkite-agent/distinfo b/devel/buildkite-agent/distinfo
index 65e005804b87..3fcf59eb2252 100644
--- a/devel/buildkite-agent/distinfo
+++ b/devel/buildkite-agent/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1742544611
-SHA256 (go/devel_buildkite-agent/buildkite-agent-v3.95.0/v3.95.0.mod) = 6230e514b8b1896bed437aa2bc8d9f0ea8c2a50d3aadb215596b3ace30f9cbb6
-SIZE (go/devel_buildkite-agent/buildkite-agent-v3.95.0/v3.95.0.mod) = 8819
-SHA256 (go/devel_buildkite-agent/buildkite-agent-v3.95.0/v3.95.0.zip) = a3e43abe1d2cbc256fc181b112e7db9829d3830ce6819467e083a62b82ba343a
-SIZE (go/devel_buildkite-agent/buildkite-agent-v3.95.0/v3.95.0.zip) = 3681244
+TIMESTAMP = 1746393503
+SHA256 (go/devel_buildkite-agent/buildkite-agent-v3.97.0/v3.97.0.mod) = 0d877e86a79827ab154425d845cc24754ee26e3b29963599b9a31a9c24470822
+SIZE (go/devel_buildkite-agent/buildkite-agent-v3.97.0/v3.97.0.mod) = 8800
+SHA256 (go/devel_buildkite-agent/buildkite-agent-v3.97.0/v3.97.0.zip) = d5acb28ea69bb4477dcd19c3682a099e369b06d504187ee13ce8dffb5ce15368
+SIZE (go/devel_buildkite-agent/buildkite-agent-v3.97.0/v3.97.0.zip) = 3690952
diff --git a/devel/buildkite-agent/files/pkg-message.in b/devel/buildkite-agent/files/pkg-message.in
index cc5939daaa91..46b721056ee0 100644
--- a/devel/buildkite-agent/files/pkg-message.in
+++ b/devel/buildkite-agent/files/pkg-message.in
@@ -1,28 +1,28 @@
 [
 { type: install
   message: <<EOM
 buildkite-agent requires minimal configuration in rc.conf, to allow hiding the
 the agent token from casual prying eyes, and to specify the user account to run
 the agent under, as its home directory is needed for ssh keys and agents, source
 code repositories, and temporary build worksapces.
 
-The %%PREFIX%%/rc.conf.d/buildkite file should be protected via
+The /etc/rc.conf.d/buildkite file should be protected via
 owner/group root:wheel and 0600 permissions, to ensure the API token is
 not left exposed to non-privileged users and to any processes the agent
 itself may launch.
 
 Note: the supplied user must have full filesystems permissions over its homedir.
 
-# %%PREFIX%%/rc.conf.d/buildkite
+# /etc/rc.conf.d/buildkite
 # mandatory parameters
 buildkite_enable=YES
 buildkite_token=abc123456def
 buildkite_account=sudo_make_me_a_user
 # optional parameters
 buildkite_config=%%ETCDIR%%/buildkite-agent.cfg
 buildkite_vars="KEY=value MORE=values"
 
 See https://buildkite.com/docs/agent for further details.
 EOM
 }
 ]