diff --git a/plugins/rake/completions/rake.fish b/plugins/rake/completions/rake.fish
index 437ac34..8896ae1 100644
--- a/plugins/rake/completions/rake.fish
+++ b/plugins/rake/completions/rake.fish
@@ -1,6 +1,6 @@
 # fish completion for rake
 function __fish_rake_tasks
-  rake -P ^/dev/null | grep rake | cut -c 6-
+  rake -T ^/dev/null | awk '{print $2"\t"substr($0, index($0, $4))}'
 end
 
 ### commands