diff --git a/zsh-goodies/README b/zsh-goodies/README
new file mode 100644
index 000000000..a032d18f8
--- /dev/null
+++ b/zsh-goodies/README
@@ -0,0 +1,6 @@
+Various utilities for zsh.
+
+_gclient:
+  completion for gclient command.
+  To install add a path to zsh-goodies into your fpath variable, e.g.:
+    fpath=(<path to depot_tools>/zsh-goodies $fpath)
diff --git a/zsh-goodies/_gclient b/zsh-goodies/_gclient
new file mode 100644
index 000000000..8c9144cf4
--- /dev/null
+++ b/zsh-goodies/_gclient
@@ -0,0 +1,15 @@
+#compdef gclient
+
+_values commands \
+    cleanup \
+    config  \
+    diff    \
+    export  \
+    help    \
+    pack    \
+    status  \
+    sync    \
+    update  \
+    revert  \
+    runhooks\
+    revinfo