diff --git a/plugins/nats/README.md b/plugins/nats/README.md
new file mode 100644
index 000000000..0ea26fca1
--- /dev/null
+++ b/plugins/nats/README.md
@@ -0,0 +1,14 @@
+# NATS plugin
+
+This plugin adds completion for several tools from [NATS](https://nats.io/).
+
+- [`nsc`](https://github.com/nats-io/nsc)
+- [`natscli`](https://github.com/nats-io/natscli)
+
+To use it, add `nats` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... nats)
+```
+
+This plugin does not add any aliases.
diff --git a/plugins/nats/nats.plugin.zsh b/plugins/nats/nats.plugin.zsh
new file mode 100644
index 000000000..8b95b07c6
--- /dev/null
+++ b/plugins/nats/nats.plugin.zsh
@@ -0,0 +1,23 @@
+if (( $+commands[nsc] )); then
+  # If the completion file doesn't exist yet, we need to autoload it and
+  # bind it to `nsc`. Otherwise, compinit will have already done that.
+  if [[ ! -f "$ZSH_CACHE_DIR/completions/_nsc" ]]; then
+    typeset -g -A _comps
+    autoload -Uz _nsc
+    _comps[nsc]=_nsc
+  fi
+
+  nsc completion zsh >| "$ZSH_CACHE_DIR/completions/_nsc" &|
+fi
+
+if (( $+commands[nats] )); then
+  # If the completion file doesn't exist yet, we need to autoload it and
+  # bind it to `nats`. Otherwise, compinit will have already done that.
+  if [[ ! -f "$ZSH_CACHE_DIR/completions/_nats" ]]; then
+    typeset -g -A _comps
+    autoload -Uz _nats
+    _comps[nats]=_nats
+  fi
+
+  nats --completion-script-zsh >| "$ZSH_CACHE_DIR/completions/_nats" &|
+fi
diff --git a/plugins/nsc/README.md b/plugins/nsc/README.md
deleted file mode 100644
index ce0d2c15c..000000000
--- a/plugins/nsc/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# NSC plugin
-
-This plugin adds completion for the [NSC](https://github.com/nats-io/nsc).
-
-To use it, add `nsc` to the plugins array in your zshrc file:
-
-```zsh
-plugins=(... nsc)
-```
-
-This plugin does not add any aliases.
diff --git a/plugins/nsc/nsc.plugin.zsh b/plugins/nsc/nsc.plugin.zsh
deleted file mode 100644
index daa599e8f..000000000
--- a/plugins/nsc/nsc.plugin.zsh
+++ /dev/null
@@ -1,13 +0,0 @@
-if (( ! $+commands[nsc] )); then
-  return
-fi
-
-# If the completion file doesn't exist yet, we need to autoload it and
-# bind it to `nsc`. Otherwise, compinit will have already done that.
-if [[ ! -f "$ZSH_CACHE_DIR/completions/_nsc" ]]; then
-  typeset -g -A _comps
-  autoload -Uz _nsc
-  _comps[nsc]=_nsc
-fi
-
-nsc completion zsh >| "$ZSH_CACHE_DIR/completions/_nsc" &|