diff --git a/plugins/fluxcd/README.md b/plugins/fluxcd/README.md
new file mode 100644
index 000000000..9723fcc6b
--- /dev/null
+++ b/plugins/fluxcd/README.md
@@ -0,0 +1,9 @@
+# FluxCD plugin
+
+This plugin adds completion for [FluxCD](https://fluxcd.io), an open and extensible continuous delivery solution for Kubernetes. Powered by GitOps Toolkit.
+
+To use it, add `fluxcd` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... fluxcd)
+```
diff --git a/plugins/fluxcd/fluxcd.plugin.zsh b/plugins/fluxcd/fluxcd.plugin.zsh
new file mode 100644
index 000000000..d30866a06
--- /dev/null
+++ b/plugins/fluxcd/fluxcd.plugin.zsh
@@ -0,0 +1,14 @@
+# Autocompletion for the FluxCD CLI (flux).
+if (( ! $+commands[flux] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `flux`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_flux" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _flux
+  _comps[flux]=_flux
+fi
+
+flux completion zsh >| "$ZSH_CACHE_DIR/completions/_flux" &|