diff --git a/plugins/finch/README.md b/plugins/finch/README.md
new file mode 100644
index 000000000..d8a0d612e
--- /dev/null
+++ b/plugins/finch/README.md
@@ -0,0 +1,9 @@
+# Finch plugin
+
+This plugin adds auto-completion and aliases for [finch](https://runfinch.com/).
+
+To use it add `finch` to the plugins array in your zshrc file.
+
+```zsh
+plugins=(... finch)
+```
diff --git a/plugins/finch/finch.plugin.zsh b/plugins/finch/finch.plugin.zsh
new file mode 100644
index 000000000..bd81b1090
--- /dev/null
+++ b/plugins/finch/finch.plugin.zsh
@@ -0,0 +1,13 @@
+if (( ! $+commands[finch] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `finch`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_finch" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _finch
+  _comps[finch]=_finch
+fi
+
+finch completion zsh 2> /dev/null >| "$ZSH_CACHE_DIR/completions/_finch" &|