diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 988600140..c507a7ef3 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -35,6 +35,7 @@ Completions
 
   - ``firefox``
   - ``firefox-developer-edition``
+  - ``kind`` (:issue:`9110`)
   - ``zig`` (:issue:`9083`)
 
 Improved terminal support
diff --git a/share/completions/kind.fish b/share/completions/kind.fish
new file mode 100644
index 000000000..7c78e6529
--- /dev/null
+++ b/share/completions/kind.fish
@@ -0,0 +1,2 @@
+# kind (Kubernetes in Docker)
+kind completion fish | source