diff --git a/plugins/qodana/README.md b/plugins/qodana/README.md
new file mode 100644
index 000000000..0b68bdecf
--- /dev/null
+++ b/plugins/qodana/README.md
@@ -0,0 +1,20 @@
+# JetBrains Qodana CLI plugin
+
+This plugin adds completion for the [JetBrains Qodana CLI](https://github.com/JetBrains/qodana-cli).
+
+To use it, add `qodana` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... qodana)
+```
+
+This plugin does not add any aliases.
+
+## Cache
+
+This plugin caches the completion script and is automatically updated when the
+plugin is loaded, which is usually when you start up a new terminal emulator.
+
+The cache is stored at:
+
+- `$ZSH_CACHE_DIR/completions/_qodana` completions script
diff --git a/plugins/qodana/qodana.plugin.zsh b/plugins/qodana/qodana.plugin.zsh
new file mode 100644
index 000000000..2b92a8051
--- /dev/null
+++ b/plugins/qodana/qodana.plugin.zsh
@@ -0,0 +1,14 @@
+# Autocompletion for the JetBrains Qodana CLI (qodana).
+if (( ! $+commands[qodana] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `qodana`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_qodana" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _qodana
+  _comps[qodana]=_qodana
+fi
+
+qodana completion zsh >| "$ZSH_CACHE_DIR/completions/_qodana" &|