diff --git a/plugins/molecule/README.md b/plugins/molecule/README.md
new file mode 100644
index 000000000..27b21f941
--- /dev/null
+++ b/plugins/molecule/README.md
@@ -0,0 +1,9 @@
+# Molecule plugin
+
+This plugin adds completion for [Molecule](https://ansible.readthedocs.io/projects/molecule/), the project designed to aid in the development and testing of Ansible roles..
+
+To use it, add `molecule` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... molecule)
+```
diff --git a/plugins/molecule/molecule.plugin.zsh b/plugins/molecule/molecule.plugin.zsh
new file mode 100644
index 000000000..65ba85e64
--- /dev/null
+++ b/plugins/molecule/molecule.plugin.zsh
@@ -0,0 +1,14 @@
+# Completion
+if (( ! $+commands[molecule] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `molecule`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_molecule" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _molecule
+  _comps[molecule]=_molecule
+fi
+
+_MOLECULE_COMPLETE=zsh_source molecule >| "$ZSH_CACHE_DIR/completions/_molecule" &|