diff --git a/plugins/composer/composer.plugin.zsh b/plugins/composer/composer.plugin.zsh
new file mode 100644
index 000000000..69a637c02
--- /dev/null
+++ b/plugins/composer/composer.plugin.zsh
@@ -0,0 +1,13 @@
+# Composer basic command completion
+
+_composer_get_command_list () {
+	php composer.phar --no-ansi | sed "1,/Available commands/d" | awk '/^  [a-z]+/ { print $1 }'
+}
+
+_composer () {
+  if [ -f composer.phar ]; then
+    compadd `_composer_get_command_list`
+  fi
+}
+
+compdef _composer composer.phar