diff --git a/cipd_manifest.txt b/cipd_manifest.txt
index 1bf7c9a68..661d46f6d 100644
--- a/cipd_manifest.txt
+++ b/cipd_manifest.txt
@@ -18,3 +18,6 @@ infra/tools/mac_toolchain/${os=mac}-${arch} git_revision:d4dc0c29a004b59dcca1e69
 
 # LUCI rpc command line tool
 infra/tools/prpc/${platform} git_revision:bf5820217a310115ae8b971dee6ff6cb894ea3bf
+
+# LUCI authentication command line tool
+infra/tools/luci-auth/${platform} git_revision:bf5820217a310115ae8b971dee6ff6cb894ea3bf
diff --git a/luci-auth b/luci-auth
new file mode 100755
index 000000000..e2c50c084
--- /dev/null
+++ b/luci-auth
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Copyright 2018 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/luci-auth" "$@"
+
diff --git a/luci-auth.bat b/luci-auth.bat
new file mode 100644
index 000000000..74b0b67d6
--- /dev/null
+++ b/luci-auth.bat
@@ -0,0 +1,8 @@
+@echo off
+:: Copyright 2018 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\luci-auth.exe" %*
+