diff --git a/cluster/saltbase/salt/etcdctl/init.sls b/cluster/saltbase/salt/etcdctl/init.sls
new file mode 100644
index 00000000000..a6dd90f42cd
--- /dev/null
+++ b/cluster/saltbase/salt/etcdctl/init.sls
@@ -0,0 +1,16 @@
+etcdctl-install:
+  git.latest:
+    - target: /var/src/etcdctl
+    - name: git://github.com/coreos/etcdctl
+  cmd.wait:
+    - cwd: /var/src/etcdctl
+    - name: ./build
+    - env:
+      - PATH: {{ grains['path'] }}:/usr/local/bin
+    - watch:
+      - git: etcdctl-install
+  file.symlink:
+    - name: /usr/local/bin/etcdctl
+    - target: /var/src/etcdctl/bin/etcdctl
+    - watch:
+      - cmd: etcdctl-install
diff --git a/cluster/saltbase/salt/top.sls b/cluster/saltbase/salt/top.sls
index 8a884e0555a..59c407f1bc8 100644
--- a/cluster/saltbase/salt/top.sls
+++ b/cluster/saltbase/salt/top.sls
@@ -21,6 +21,7 @@ base:
     - match: grain
     - golang
     - etcd
+    - etcdctl
     - apiserver
     - controller-manager
     - scheduler