1 files changed, 9 insertions, 1 deletions
diff --git a/Completion/Unix/Command/_django b/Completion/Unix/Command/_django
index 1d5cf7311..4893dcb64 100644
--- a/Completion/Unix/Command/_django
+++ b/Completion/Unix/Command/_django
@@ -57,7 +57,15 @@ case $state in
     )
 
     for cmd in $(./manage.py --help 2>&1 >/dev/null | \
-        awk -v drop=1 '{ if (!drop) print substr($0, 3) } /^Available subcommands/ { drop=0 }')
+        awk -v drop=1 '
+            /^Available subcommands/ { drop = 0; next }
+            drop                     { next }
+            /^\[/                    { next }
+            /^[[:space:]]/ {
+                sub(/^[[:space:]]+/, "")
+                print
+            }
+        ')
     do
         if ! echo $subcommands | grep -qs "${cmd}:"
         then