diff --git a/devel/Makefile b/devel/Makefile
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -348,6 +348,7 @@
     SUBDIR += build
     SUBDIR += build2
     SUBDIR += buildkite-agent
+    SUBDIR += buildkite-cli
     SUBDIR += bullet
     SUBDIR += bunyan
     SUBDIR += busd
diff --git a/devel/buildkite-cli/Makefile b/devel/buildkite-cli/Makefile
new file mode 100644
--- /dev/null
+++ b/devel/buildkite-cli/Makefile
@@ -0,0 +1,27 @@
+PORTNAME=	buildkite-cli
+DISTVERSIONPREFIX=	v
+DISTVERSION=	3.7.1
+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
new file mode 100644
--- /dev/null
+++ b/devel/buildkite-cli/distinfo
@@ -0,0 +1,7 @@
+TIMESTAMP = 1743337171
+SHA256 (go/devel_buildkite-cli/buildkite-cli-v3.7.1_GH0/v3.7.1.mod) = a2193454c8ad6384ae716cceba84fc3f660caf35a02850517714f92afe5092f9
+SIZE (go/devel_buildkite-cli/buildkite-cli-v3.7.1_GH0/v3.7.1.mod) = 5180
+SHA256 (go/devel_buildkite-cli/buildkite-cli-v3.7.1_GH0/v3.7.1.zip) = 96bcd6accaae2ccfb04cb1ac6a234d47e14c843f6ef16497d3bcc92334644045
+SIZE (go/devel_buildkite-cli/buildkite-cli-v3.7.1_GH0/v3.7.1.zip) = 1034246
+SHA256 (go/devel_buildkite-cli/buildkite-cli-v3.7.1_GH0/buildkite-cli-v3.7.1_GH0.tar.gz) = 18f0ace54195b29419ca6a86ac439ae46dfd02ea89ead14cac050d4bb7594165
+SIZE (go/devel_buildkite-cli/buildkite-cli-v3.7.1_GH0/buildkite-cli-v3.7.1_GH0.tar.gz) = 972773
diff --git a/devel/buildkite-cli/files/pkg-message.in b/devel/buildkite-cli/files/pkg-message.in
new file mode 100644
--- /dev/null
+++ b/devel/buildkite-cli/files/pkg-message.in
@@ -0,0 +1,9 @@
+[
+{ type: install
+  message: <<EOM
+On first install, run `bk configure1` to set up your organization and API token.
+
+See https://buildkite.com/docs/platform/cli for further details.
+EOM
+}
+]
diff --git a/devel/buildkite-cli/pkg-descr b/devel/buildkite-cli/pkg-descr
new file mode 100644
--- /dev/null
+++ b/devel/buildkite-cli/pkg-descr
@@ -0,0 +1,4 @@
+The Buildkite CLI is a command-line interface tool for interacting directly
+with Buildkite itself. This tool provides command line/terminal access to work
+with a subset of Buildkite's features, as you normally would through
+Buildkite's web interface.