diff --git a/share/completions/canto.fish b/share/completions/canto.fish
new file mode 100644
index 000000000..ad75b4cf9
--- /dev/null
+++ b/share/completions/canto.fish
@@ -0,0 +1,35 @@
+
+function __fish_canto_using_command
+  set cmd (commandline -opc)
+  if [ (count $cmd) -gt 1 ]
+    if [ $argv[1] = $cmd[2] ]
+      return 0
+    end
+    if [ count $argv -gt 2 ]
+      if [ $argv[2] = $cmd[2] ]
+        return 0
+      end
+    end
+  end
+  return 1
+end
+
+
+complete -f -c canto -s h -l help -d 'Show Help'
+complete -f -c canto -s v -l version -d 'Show version'
+complete -f -c canto -s u -l update -d 'Update before running'
+complete -f -c canto -s l -l list -d 'List feeds'
+complete -f -c canto -s a -l checkall -d 'Show number of new items'
+
+complete -f -c canto -s n -l checknew -d 'Show number of new items for feed'
+complete -f -c canto -n '__fish_canto_using_command -l --checknew' -d 'Feed' -a '(command canto -l)'
+
+complete -c canto -s o -l opml -d 'Print conf as OPML'
+complete -c cnato -s i -l import -d 'Import from OPML'
+complete -f -c canto -s r -l url -d 'Add feed'
+
+complete -c canto -s D -l dir -d 'Set configuration directory'
+complete -c canto -s C -l conf -d 'Set configuration file'
+complete -c canto -s L -l log -d 'Set client log file'
+complete -c canto -s F -l fdir -d 'Set feed directory'
+complete -c canto -s S -l sdir 'Set script directory'