diff --git a/plugins/cap/cap.plugin.zsh b/plugins/cap/cap.plugin.zsh
index a0fa21d00..080ca05b0 100644
--- a/plugins/cap/cap.plugin.zsh
+++ b/plugins/cap/cap.plugin.zsh
@@ -1,7 +1,7 @@
 function _cap_does_task_list_need_generating () {
-  if [ ! -f .cap_tasks~ ]; then return 0;
+  if [ ! -f .cap_tasks ]; then return 0;
   else
-    accurate=$(stat -f%m .cap_tasks~)
+    accurate=$(stat -f%m .cap_tasks)
     changed=$(stat -f%m config/deploy.rb)
     return $(expr $accurate '>=' $changed)
   fi
@@ -10,12 +10,11 @@ function _cap_does_task_list_need_generating () {
 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~
+      echo "\nGenerating .cap_tasks..." > /dev/stderr
+      cap -vT | sed -e '/^cap/!D' | cut -d " " -f 2 > .cap_tasks
     fi
-    compadd `cat .cap_tasks~`
+    compadd `cat .cap_tasks`
   fi
 }
 
-compctl -K _cap cap
\ No newline at end of file
+compdef _cap cap
\ No newline at end of file