diff --git a/src/_artisan b/src/_artisan
index bbb72f8e17..1104a20452 100644
--- a/src/_artisan
+++ b/src/_artisan
@@ -35,17 +35,27 @@
 # -------
 #
 #  * loranger (https://github.com/loranger)
+#  * Yohan Tambè (https://github.com/Cronos87)
 #
 # ------------------------------------------------------------------------------
 
 
 _artisan_get_command_list () {
-    php artisan --no-ansi | sed "1,/Available commands/d" | awk '/ [a-z]+/ { print $1 }'
+    IFS=" "
+    php artisan --no-ansi | \
+        sed "1,/Available commands/d" | \
+        awk '/ [a-z]+/ { print $1 }' | \
+        sed -E 's/^[ ]+//g' | \
+        sed -E 's/[:]+/\\:/g' | \
+        sed -E 's/[ ]{2,}/\:/g'
 }
 
 _artisan () {
     if [ -f artisan ]; then
-        compadd `_artisan_get_command_list`
+        local -a commands
+        IFS=$'\n'
+        commands=(`_artisan_get_command_list`)
+        _describe 'commands' commands
     fi
 }
 
diff --git a/src/_console b/src/_console
index 245b0da64f..7e5b454843 100644
--- a/src/_console
+++ b/src/_console
@@ -47,7 +47,7 @@ _console_get_command_list () {
     IFS=" "
     `_find_console` --no-ansi | \
         sed "1,/Available commands/d" | \
-        awk '/ [a-z]+/ { print $0 }' | \
+        awk '/  [a-z]+/ { print $0 }' | \
         sed -E 's/^[ ]+//g' | \
         sed -E 's/[:]+/\\:/g' | \
         sed -E 's/[ ]{2,}/\:/g'