diff --git a/completion/fish/aurto.fish b/completion/fish/aurto.fish
new file mode 100644
index 0000000..937d6e0
--- /dev/null
+++ b/completion/fish/aurto.fish
@@ -0,0 +1,9 @@
+function _aurto_no_command
+  set cmd (commandline -opc)
+  if [ (count $cmd) -eq 1 -a $cmd[1] = 'aurto' ]
+    return 0
+  end
+  return 1
+end
+
+complete -f -c aurto -n '_aurto_no_command' -a 'add addpkg remove'
diff --git a/makefile b/makefile
index 9875f05..5f064c2 100644
--- a/makefile
+++ b/makefile
@@ -12,5 +12,6 @@ all:
 	@install -D timer/* -t target$(PREFIX)/lib/systemd/system
 
 	@install -D completion/bash/aurto target$(PREFIX)/share/bash-completion/completions/aurto
+	@install -D completion/fish/aurto.fish target$(PREFIX)/share/fish/completions/aurto.fish
 
 	@if command -v tree >/dev/null 2>&1; then tree target; fi