diff --git a/Makefile b/Makefile
index 999a677..59a9840 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ LIBDIR ?= $(PREFIX)/lib
 SYSTEM_EXTENSION_DIR ?= $(LIBDIR)/password-store/extensions
 MANDIR ?= $(PREFIX)/man
 BASHCOMPDIR ?= /etc/bash_completion.d
+FISHCOMPDIR ?= $(shell pkg-config --variable completionsdir fish || echo "/usr/share/fish/vendor_completions.d/")
 
 all:
 	@echo "pass-$(PROG) is a shell script and does not need compilation, it can be simply executed."
@@ -20,6 +21,8 @@ install:
 	install -m0755 $(PROG).bash "$(DESTDIR)$(SYSTEM_EXTENSION_DIR)/$(PROG).bash"
 	install -d "$(DESTDIR)$(BASHCOMPDIR)/"
 	install -m 644 pass-otp.bash.completion  "$(DESTDIR)$(BASHCOMPDIR)/pass-otp"
+	install -d "$(DESTDIR)$(FISHCOMPDIR)/"
+	install -m 644 pass-otp.fish.completion  "$(DESTDIR)$(FISHCOMPDIR)/pass-otp.fish"
 	@echo
 	@echo "pass-$(PROG) is installed succesfully"
 	@echo
diff --git a/pass-otp.fish.completion b/pass-otp.fish.completion
new file mode 100644
index 0000000..164b297
--- /dev/null
+++ b/pass-otp.fish.completion
@@ -0,0 +1,7 @@
+#!/usr/bin/env fish
+
+source "/usr/share/fish/vendor_completions.d/pass.fish"
+
+complete -c pass -f -n '__fish_pass_needs_command' -a otp -d 'Command: Generate an OTP code'
+complete -c pass -f -n '__fish_pass_uses_command otp' -s c -l clip -d 'Put otp code in clipboard'
+complete -c pass -f -n '__fish_pass_uses_command otp' -a "(__fish_pass_print_entries)"