diff --git a/bb b/bb
new file mode 100755
index 000000000..e26281d41
--- /dev/null
+++ b/bb
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+MYPATH=$(dirname "${BASH_SOURCE[0]}")
+
+source "$MYPATH/cipd_bin_setup.sh"
+cipd_bin_setup &> /dev/null
+
+exec "$MYPATH/.cipd_bin/bb" "$@"
diff --git a/bb.bat b/bb.bat
new file mode 100644
index 000000000..b401a49ff
--- /dev/null
+++ b/bb.bat
@@ -0,0 +1,7 @@
+@echo off
+:: Copyright 2019 The Chromium Authors. All rights reserved.
+:: Use of this source code is governed by a BSD-style license that can be
+:: found in the LICENSE file.
+
+call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
+"%~dp0\.cipd_bin\bb.exe" %*
diff --git a/cipd_manifest.txt b/cipd_manifest.txt
index 285339510..1b2de456f 100644
--- a/cipd_manifest.txt
+++ b/cipd_manifest.txt
@@ -35,3 +35,6 @@ infra/tools/prpc/${platform} git_revision:edd5644be66d37cdf82978efb0e5d6504d0d55
 
 # LUCI authentication command line tool
 infra/tools/luci-auth/${platform} git_revision:edd5644be66d37cdf82978efb0e5d6504d0d552f
+
+# LUCI Buildbucket CLI
+infra/tools/bb/${platform} git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
diff --git a/cipd_manifest.versions b/cipd_manifest.versions
index 373fce593..fab93261c 100644
--- a/cipd_manifest.versions
+++ b/cipd_manifest.versions
@@ -1,6 +1,58 @@
 # This file is auto-generated by 'cipd ensure-file-resolve'.
 # Do not modify manually. All changes will be overwritten.
 
+infra/tools/bb/linux-386
+	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
+	mPwoDv1jAOnI6IrgKLik9VsIGR1nmwD9BcgiNfpSzA8C
+
+infra/tools/bb/linux-amd64
+	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
+	2wMQ5j_ByIl56Eq3j8u6kN_mQON5GGdCBWHKE4YIKDEC
+
+infra/tools/bb/linux-arm64
+	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
+	0-5oMrOVGiEJWTxR9jY8pKLv_ffThuYybmdrKhQChCcC
+
+infra/tools/bb/linux-armv6l
+	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
+	JL8_joC43BLGHsdPGR5f5TwGM00Y7NPT_zuqrsTDLi8C
+
+infra/tools/bb/linux-mips64
+	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
+	fn1456KC8ezsgvQmlW1D8Q1T7u6yHXkCRBNCVwmecPEC
+
+infra/tools/bb/linux-mips64le
+	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
+	ifekKtHB94cXgccpNOe9iPVRL4idOPAIloSKEwbUPtoC
+
+infra/tools/bb/linux-mipsle
+	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
+	l1nvhdR1pYh59T4skedAejQ_kmXG9CIgnJmizIu8W1MC
+
+infra/tools/bb/linux-ppc64
+	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
+	GTGT_OIBGiYxP6lb-0j-DP23X3Xlf99TG_leUNeeSyYC
+
+infra/tools/bb/linux-ppc64le
+	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
+	zGq06mfS4zadQrd5RuCbf3ofv1mPJXQawAh9X-77ZhcC
+
+infra/tools/bb/linux-s390x
+	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
+	wugZfzRY-uA5dj3k-PuWKaL2AivjzduVDwaQN1jtbsYC
+
+infra/tools/bb/mac-amd64
+	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
+	EfjHvgv9SLiyjziwWJv1Thr8ZNwR9OjY8gMKPflIbMwC
+
+infra/tools/bb/windows-386
+	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
+	upzKAIlXjpJo64ai4pL9orgWye-pxmIeUCLA_v8496AC
+
+infra/tools/bb/windows-amd64
+	git_revision:60f4789e3c66c65c26b4429b299fe16480df0d1b
+	1SDEYRowxYupUnZU_aPlbNayPslK3IvSRhQ0s9TK5jkC
+
 infra/tools/luci-auth/linux-386
 	git_revision:edd5644be66d37cdf82978efb0e5d6504d0d552f
 	8TWSqbfcomDrxK72OV-nPlCUsb58EiGmWPI7Ml3C1j4C