diff --git a/plugins/tmuxinator/_tmuxinator b/plugins/tmuxinator/_tmuxinator
deleted file mode 100644
index f0ff304dd..000000000
--- a/plugins/tmuxinator/_tmuxinator
+++ /dev/null
@@ -1,36 +0,0 @@
-#compdef tmuxinator
-#autoload
-
-local curcontext="$curcontext" state line ret=1
-local -a _configs
-
-_arguments -C \
-  '1: :->cmds' \
-  '2:: :->args' && ret=0
-
-case $state in
-  cmds)
-    _values "tmuxinator command" \
-        "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]" \
-        "implode[deletes all existing projects!]" \
-        "list[list all existing projects]" \
-        "doctor[look for problems in your configuration]" \
-        "help[shows this help document]" \
-        "version[shows tmuxinator version number]"
-    ret=0
-    ;;
-  args)
-    case $line[1] in
-      start|open|copy|delete)
-        _configs=(`tmuxinator list | sed -n 's/^[ \t]\+//p'`)
-        _values 'configs' $_configs
-        ret=0
-        ;;
-    esac
-    ;;
-esac
-
-return ret
\ No newline at end of file
diff --git a/plugins/tmuxinator/tmuxinator.plugin.zsh b/plugins/tmuxinator/tmuxinator.plugin.zsh
new file mode 100644
index 000000000..7df243580
--- /dev/null
+++ b/plugins/tmuxinator/tmuxinator.plugin.zsh
@@ -0,0 +1,22 @@
+#!/usr/bin/env zsh
+# plugin from tmuxinator project:
+# https://github.com/tmuxinator/tmuxinator/blob/v0.6.7/completion/tmuxinator.zsh
+
+if [[ ! -o interactive ]]; then
+    return
+fi
+
+compctl -K _tmuxinator tmuxinator mux
+
+_tmuxinator() {
+  local words completions
+  read -cA words
+
+  if [ "${#words}" -eq 2 ]; then
+    completions="$(tmuxinator commands)"
+  else
+    completions="$(tmuxinator completions ${words[2,-2]})"
+  fi
+
+  reply=("${(ps:\n:)completions}")
+}