diff --git a/plugins/fabric/fabric.plugin.zsh b/plugins/fabric/fabric.plugin.zsh
new file mode 100644
index 000000000..119be9e67
--- /dev/null
+++ b/plugins/fabric/fabric.plugin.zsh
@@ -0,0 +1,19 @@
+#!zsh
+# 
+# Installation
+# ------------
+# 
+# To achieve fabfile completion nirvana:
+# 
+#   Copy this file somewhere (e.g. ~/.fab-comletion.zsh) and put the following line in your .zshrc:
+# 
+#        source ~/.fab-comletion.zsh
+#
+#    Or, use this file as a oh-my-zsh plugin.
+#
+
+_fab_list() {
+	reply=(`fab --shortlist`) 
+}
+compctl -K _fab_list fab
+