diff --git a/lib/cap.zsh b/lib/cap.zsh
new file mode 100644
index 000000000..086ba9e25
--- /dev/null
+++ b/lib/cap.zsh
@@ -0,0 +1,24 @@
+# May need to trash `.zcompdump` and regenerate it 
+# with `compinit` for this to work
+
+_cap_does_task_list_need_generating () {
+  if [ ! -f .cap_tasks~ ]; then return 0;
+  else
+    accurate=$(stat -f%m .cap_tasks~)
+    changed=$(stat -f%m config/deploy.rb)
+    return $(expr $accurate '>=' $changed)
+  fi
+}
+
+_cap () {
+  if [ -f capfile ]; then
+    if _cap_does_task_list_need_generating; then
+      echo "\nGenerating .cap_tasks~..." > /dev/stderr
+      cap -vT | awk 'FB != 1 {if ($0 ~ /^$/){FB=1}else{print $2}}' > .cap_tasks~
+    fi
+    compadd `cat .cap_tasks~`
+  fi
+}
+
+compctl -K _cap cap
+
diff --git a/lib/rake.zsh b/lib/rake.zsh
new file mode 100644
index 000000000..5040f4fb3
--- /dev/null
+++ b/lib/rake.zsh
@@ -0,0 +1,21 @@
+_rake_does_task_list_need_generating () {
+  if [ ! -f .rake_tasks~ ]; then return 0;
+  else
+    accurate=$(stat -f%m .rake_tasks~)
+    changed=$(stat -f%m Rakefile)
+    return $(expr $accurate '>=' $changed)
+  fi
+}
+
+_rake () {
+  if [ -f Rakefile ]; then
+    if _rake_does_task_list_need_generating; then
+      echo "\nGenerating .rake_tasks~..." > /dev/stderr
+      rake --silent --tasks | cut -d " " -f 2 > .rake_tasks~
+    fi
+    compadd `cat .rake_tasks~`
+  fi
+}
+
+compctl -K _rake rake
+
diff --git a/lib/rake_completion.zsh b/lib/rake_completion.zsh
deleted file mode 100644
index c425a625e..000000000
--- a/lib/rake_completion.zsh
+++ /dev/null
@@ -1,42 +0,0 @@
-_rake_does_task_list_need_generating () {
-  if [ ! -f .rake_tasks~ ]; then return 0;
-  else
-    accurate=$(stat -f%m .rake_tasks~)
-    changed=$(stat -f%m Rakefile)
-    return $(expr $accurate '>=' $changed)
-  fi
-}
-
-_rake () {
-  if [ -f Rakefile ]; then
-    if _rake_does_task_list_need_generating; then
-      echo "\nGenerating .rake_tasks~..." > /dev/stderr
-      rake --silent --tasks | cut -d " " -f 2 > .rake_tasks~
-    fi
-    compadd `cat .rake_tasks~`
-  fi
-}
-
-compctl -K _rake rake
-
-function _cap_does_task_list_need_generating () {
-  if [ ! -f .cap_tasks~ ]; then return 0;
-  else
-    accurate=$(stat -f%m .cap_tasks~)
-    changed=$(stat -f%m config/deploy.rb)
-    return $(expr $accurate '>=' $changed)
-  fi
-}
-
-function _cap () {
-  if [ -f config/deploy.rb ]; then
-    if _cap_does_task_list_need_generating; then
-      echo "\nGenerating .cap_tasks~..." > /dev/stderr
-      cap show_tasks -q | cut -d " " -f 1 | sed -e '/^ *$/D' -e '1,2D'
-> .cap_tasks~
-    fi
-    compadd `cat .cap_tasks~`
-  fi
-}
-
-compctl -K _cap cap