diff --git a/src/templates/completion-fish.handlebars b/src/templates/completion-fish.handlebars
new file mode 100644
index 0000000..ec3397c
--- /dev/null
+++ b/src/templates/completion-fish.handlebars
@@ -0,0 +1,18 @@
+# fish completion for {{spec.name}}
+# Auto-generated by cli-spec-generator
+
+complete -c {{spec.name}} -f
+complete -c {{spec.name}} -a '{{#each spec.commands}}{{name}} {{/each}}'
+complete -c {{spec.name}} -s h -l help -d 'Show help'
+complete -c {{spec.name}} -s v -l version -d 'Show version'
+
+{{#each spec.globalOptions}}
+complete -c {{spec.name}} -l {{name}}{{#if short}} -s {{short}}{{/if}} -d '{{escape description}}'
+{{/each}}
+
+{{#each spec.commands}}
+complete -c {{spec.name}} -a '{{name}}' -d '{{escape description}}'
+{{#each options}}
+complete -c {{spec.name}} -a '{{name}}' -l {{name}}{{#if short}} -s {{short}}{{/if}} -d '{{escape description}}'
+{{/each}}
+{{/each}}