diff --git a/devel/buildkite-agent/Makefile b/devel/buildkite-agent/Makefile
index a4132309747e..cb3e0e52d9be 100644
--- a/devel/buildkite-agent/Makefile
+++ b/devel/buildkite-agent/Makefile
@@ -1,48 +1,44 @@
 PORTNAME=	buildkite-agent
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.47.0
-PORTREVISION=	10
+DISTVERSION=	3.92.1
 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:modules
+USES=		go:1.23,modules
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	buildkite
-GH_PROJECT=	agent
 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' \
-			`${FIND} ${WRKSRC}/packaging/linux -type f`
-	@${REINPLACE_CMD} -I '' -e 's|/bin/bash|${LOCALBASE}/bin/bash|g' \
-			`${FIND} ${WRKSRC}/bootstrap -type f -name *.go`
+	${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 7d4d875e453e..3799cae86a8f 100644
--- a/devel/buildkite-agent/distinfo
+++ b/devel/buildkite-agent/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1686045606
-SHA256 (go/devel_buildkite-agent/buildkite-agent-v3.47.0_GH0/v3.47.0.mod) = 62c3d1424463d3744ee75c538f975d8e78db8585aa71cc81b99a8deb886d1be1
-SIZE (go/devel_buildkite-agent/buildkite-agent-v3.47.0_GH0/v3.47.0.mod) = 4707
-SHA256 (go/devel_buildkite-agent/buildkite-agent-v3.47.0_GH0/v3.47.0.zip) = b228312d8a0e323279cf2b4977d811bdda47464ed935ab3dd65aba525d3fd26b
-SIZE (go/devel_buildkite-agent/buildkite-agent-v3.47.0_GH0/v3.47.0.zip) = 3417920
-SHA256 (go/devel_buildkite-agent/buildkite-agent-v3.47.0_GH0/buildkite-agent-v3.47.0_GH0.tar.gz) = 52acd76bb1f8e155a0a20283fc00ff73c8f8a1a92f72ade7ac9eb3fe260cd7e0
-SIZE (go/devel_buildkite-agent/buildkite-agent-v3.47.0_GH0/buildkite-agent-v3.47.0_GH0.tar.gz) = 3242194
+TIMESTAMP = 1741088209
+SHA256 (go/devel_buildkite-agent/buildkite-agent-v3.92.1/v3.92.1.mod) = a468198762efb3253fd68b72e58bc8d0374ea4f53e98d3a064ab5cdf10bc374f
+SIZE (go/devel_buildkite-agent/buildkite-agent-v3.92.1/v3.92.1.mod) = 8886
+SHA256 (go/devel_buildkite-agent/buildkite-agent-v3.92.1/v3.92.1.zip) = a37e1eb2bbe1ac4a32bc9f2cd8e569998374283093d54cc23b50bbd30936bd51
+SIZE (go/devel_buildkite-agent/buildkite-agent-v3.92.1/v3.92.1.zip) = 3604811