diff --git a/share/completions/hikari.fish b/share/completions/hikari.fish
new file mode 100644
index 000000000..a8dd5ff1c
--- /dev/null
+++ b/share/completions/hikari.fish
@@ -0,0 +1,7 @@
+set PROG 'hikari'
+
+complete -c $PROG -f
+complete -c $PROG -s 'a' -F -d 'Specify autostart executable'
+complete -c $PROG -s 'c' -F -d 'Specify a configuration file'
+complete -c $PROG -f -s 'h' -d 'Show help message and quit'
+complete -c $PROG -f -s 'v' -d 'Show version and quit'