diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3da1a3dd2..e60d8f014 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -117,6 +117,7 @@ Completions
   - ``loadkeys``
   - ``toot``
   - ``eg``
+  - ``kb``
 
 - Improvements to some completions.
 
diff --git a/share/completions/kb.fish b/share/completions/kb.fish
new file mode 100644
index 000000000..d96df50f6
--- /dev/null
+++ b/share/completions/kb.fish
@@ -0,0 +1,8 @@
+# Based on https://github.com/gnebbia/kb#usage
+
+set -l commands add edit list view grep update delete template import export erase sync help
+
+complete -c kb -s h -l help -d 'Show help and exit'
+complete -c kb -l version -d 'Show version and exit'
+
+complete -c kb -n "not __fish_seen_subcommand_from $commands" -a $commands