diff --git a/plugins/chefvm/_chefvm b/plugins/chefvm/_chefvm
new file mode 100644
index 000000000..8bc86fba2
--- /dev/null
+++ b/plugins/chefvm/_chefvm
@@ -0,0 +1,5 @@
+#compdef chefvm
+
+_arguments \
+  "1:Commands:($(__chefvm_commands))" \
+  "*:Configurations:($(__chefvm_configs))"
diff --git a/plugins/chefvm/chefvm.plugin.zsh b/plugins/chefvm/chefvm.plugin.zsh
new file mode 100644
index 000000000..7ead4762d
--- /dev/null
+++ b/plugins/chefvm/chefvm.plugin.zsh
@@ -0,0 +1,5 @@
+function knife_config {
+  if [[ -e $HOME/.chefvm && -e $HOME/.chef ]] ; then
+    echo $( cd -P $HOME/.chef ; basename $PWD )
+  fi
+}