diff --git a/devel/buildkite-cli/Makefile b/devel/buildkite-cli/Makefile
index 9f62a0e6faed..0c0ce5bce565 100644
--- a/devel/buildkite-cli/Makefile
+++ b/devel/buildkite-cli/Makefile
@@ -1,28 +1,27 @@
 PORTNAME=	buildkite-cli
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.13.1
-PORTREVISION=	7
+DISTVERSION=	3.40.0
 CATEGORIES=	devel sysutils
 
 MAINTAINER=	dch@FreeBSD.org
 COMMENT=	CLI tool for Buildkite
 WWW=		https://github.com/buildkite/cli
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 USES=		go:1.24+,modules
 USE_GITHUB=	yes
 GH_ACCOUNT=	buildkite
 GH_PROJECT=	cli
 
 GO_MODULE=	github.com/buildkite/cli/v3
 GO_BUILDFLAGS+=	-ldflags="-X github.com/buildkite/cli/v3/internal/version.Version=${PORTVERSION}"
 GO_ENV+=	GOTOOLCHAIN=local+path
 
 PLIST_FILES=	bin/bk
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/bk
 
 .include <bsd.port.mk>
diff --git a/devel/buildkite-cli/distinfo b/devel/buildkite-cli/distinfo
index 6676159f733d..f18313c4b08e 100644
--- a/devel/buildkite-cli/distinfo
+++ b/devel/buildkite-cli/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1760694419
-SHA256 (go/devel_buildkite-cli/buildkite-cli-v3.13.1_GH0/v3.13.1.mod) = abbed5ac4a592a89021b85e0309c65e78d3f16df5cc143ef9e1a27aec592c85d
-SIZE (go/devel_buildkite-cli/buildkite-cli-v3.13.1_GH0/v3.13.1.mod) = 5201
-SHA256 (go/devel_buildkite-cli/buildkite-cli-v3.13.1_GH0/v3.13.1.zip) = 90af2ae431aab91b48a7345b694fcfc65959028f699cf9f72c0a7cf75927fee1
-SIZE (go/devel_buildkite-cli/buildkite-cli-v3.13.1_GH0/v3.13.1.zip) = 1105728
-SHA256 (go/devel_buildkite-cli/buildkite-cli-v3.13.1_GH0/buildkite-cli-v3.13.1_GH0.tar.gz) = cb207c0f7a25b24cf11d0c129668809daf3269102b3406bc11879848d7a53982
-SIZE (go/devel_buildkite-cli/buildkite-cli-v3.13.1_GH0/buildkite-cli-v3.13.1_GH0.tar.gz) = 1027553
+TIMESTAMP = 1777880087
+SHA256 (go/devel_buildkite-cli/buildkite-cli-v3.40.0_GH0/v3.40.0.mod) = d794cbe42e8da468d09efc33a47909eaa77b7a53e6973ba395869a7e492d262d
+SIZE (go/devel_buildkite-cli/buildkite-cli-v3.40.0_GH0/v3.40.0.mod) = 3734
+SHA256 (go/devel_buildkite-cli/buildkite-cli-v3.40.0_GH0/v3.40.0.zip) = a6d4feff4dd272b0ef04c2a54644cbfd9cf6e6372c012eb5135c5475f5aa478f
+SIZE (go/devel_buildkite-cli/buildkite-cli-v3.40.0_GH0/v3.40.0.zip) = 1257140
+SHA256 (go/devel_buildkite-cli/buildkite-cli-v3.40.0_GH0/buildkite-cli-v3.40.0_GH0.tar.gz) = 44cf95bc5ef1a515d114bfa6093ef625427e00f5aef8bfc94d9c2415bfe0d5d0
+SIZE (go/devel_buildkite-cli/buildkite-cli-v3.40.0_GH0/buildkite-cli-v3.40.0_GH0.tar.gz) = 1126791