diff --git a/share/completions/jbake.fish b/share/completions/jbake.fish
new file mode 100644
index 000000000..90967e349
--- /dev/null
+++ b/share/completions/jbake.fish
@@ -0,0 +1,7 @@
+# Completions for JBake (https://jbake.org/)
+
+complete -c jbake -o b -l bake -f -d "Perform a bake"
+complete -c jbake -o h -l help -f -d "Print the help message"
+complete -c jbake -o i -l init -d "Initialise the required directory structure with default templates"
+complete -c jbake -o s -l server -d "Run the HTTP server to serve out the baked site"
+complete -c jbake -o t -l template -x -d "Use the specified template engine for default templates"