diff --git a/plugins/cap/cap.plugin.zsh b/plugins/cap/cap.plugin.zsh
index a0fa21d00..a9db4381b 100644
--- a/plugins/cap/cap.plugin.zsh
+++ b/plugins/cap/cap.plugin.zsh
@@ -11,11 +11,10 @@ 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~
+      cap --tasks | grep '#' | cut -d " " -f 2 > .cap_tasks~
     fi
     compadd `cat .cap_tasks~`
   fi
 }
 
-compctl -K _cap cap
\ No newline at end of file
+compdef _cap cap