diff --git a/plugins/tmuxinator/_tmuxinator b/plugins/tmuxinator/_tmuxinator
index cd227b7d..e4f8b6ce 100644
--- a/plugins/tmuxinator/_tmuxinator
+++ b/plugins/tmuxinator/_tmuxinator
@@ -11,10 +11,12 @@ _arguments -C \
 case $state in
   cmds)
     _values "tmuxinator command" \
+        "new[create a new project file and open it in your editor]" \
         "start[start a tmux session using project's tmuxinator config]" \
         "open[create a new project file and open it in your editor]" \
         "copy[copy source_project project file to a new project called new_project]" \
         "delete[deletes the project called project_name]" \
+        "debug[output the shell commands generated by a projet]" \
         "implode[deletes all existing projects!]" \
         "list[list all existing projects]" \
         "doctor[look for problems in your configuration]" \
@@ -24,9 +26,9 @@ case $state in
     ;;
   args)
     case $line[1] in
-      start|open|copy|delete)
+      start|open|copy|delete|debug)
         _configs=(`find ~/.tmuxinator -name \*.yml | cut -d/ -f5 | sed s:.yml::g`)
-        _values 'configs' $_configs
+        [[ -n "$_configs" ]] && _values 'configs' $_configs
         ret=0
         ;;
     esac