diff --git a/cipd_manifest.txt b/cipd_manifest.txt
index 0c5fa8889..b280e73a3 100644
--- a/cipd_manifest.txt
+++ b/cipd_manifest.txt
@@ -12,3 +12,6 @@ infra/tools/luci/vpython/${platform}  git_revision:a3d636052088db3daa48413b3e209
 
 # LUCI editor
 infra/tools/luci/led/${platform}  git_revision:d1e9a52e1c8414cd0a0df8bec6c37f325e0fbaa1
+
+# Mac toolchain installer
+infra/tools/mac_toolchain/${os=mac}-${arch} git_revision:7eb9e7d8efe8bfec749e364470c5e7a7260c9ac2
diff --git a/mac_toolchain b/mac_toolchain
new file mode 100755
index 000000000..ef4beaef7
--- /dev/null
+++ b/mac_toolchain
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Copyright 2017 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/mac_toolchain" "$@"