diff --git a/plugins/n98-magerun/n98-magerun.plugin.zsh b/plugins/n98-magerun/n98-magerun.plugin.zsh
index e4b0d688..3a29f39b 100755
--- a/plugins/n98-magerun/n98-magerun.plugin.zsh
+++ b/plugins/n98-magerun/n98-magerun.plugin.zsh
@@ -7,7 +7,7 @@
 
 # n98-magerun basic command completion
 _n98_magerun_get_command_list () {
-  n98-magerun.phar --no-ansi | sed "1,/Available commands/d" | awk '/^\s+[a-z]+/ { print $1 }'
+  n98-magerun.phar --no-ansi | sed "1,/Available commands/d" | awk '/^ +[a-z\-:]+/ { print $1 }'
 }
 
 _n98_magerun () {
@@ -15,9 +15,10 @@ _n98_magerun () {
 }
 
 compdef _n98_magerun n98-magerun.phar
+compdef _n98_magerun n98-magerun
 
 # Aliases
-alias n98-magerun='n98-magerun.phar'
+alias n98='n98-magerun.phar'
 alias mage='n98-magerun.phar'
 alias magefl='n98-magerun.phar cache:flush'