diff --git a/srcpkgs/gopass/template b/srcpkgs/gopass/template
index 180b13fa6fb..12e39cad401 100644
--- a/srcpkgs/gopass/template
+++ b/srcpkgs/gopass/template
@@ -1,17 +1,31 @@
 # Template file for 'gopass'
 pkgname=gopass
-version=1.6.7
+version=1.6.9
 revision=1
 build_style=go
 go_import_path="github.com/justwatchcom/gopass"
 depends="gnupg2 git"
+makedepends="gnupg2"
 short_desc="The slightly more awesome standard unix password manager for teams"
 maintainer="Dominic Monroe <monroef4@googlemail.com>"
 license="MIT"
 homepage="https://www.justwatch.com/gopass/"
 distfiles="https://github.com/justwatchcom/gopass/archive/v${version}.tar.gz"
-checksum=7c8811cb9263b3b53e7b48ee9d7683edaaa0102ef4b9c801e60a527fe7d5924e
+checksum=d11f0bdca9ff5a546a066a06a2c1399e7a9591326423e87123981fcaf9ff2cc5
+nocross=yes
+
+post_build() {
+	local GOPASS=${GOPATH}/bin/gopass
+	local completions=(zsh bash fish)
+
+	for completion in "${completions[@]}"; do
+		$GOPASS completion $completion > ${completion}.completion;
+	done
+}
 
 post_install() {
+	install -Dm0755 zsh.completion ${DESTDIR}/usr/share/zsh/site-functions/_gopass
+	install -Dm0755 bash.completion ${DESTDIR}/usr/share/bash-completion/completions/gopass
+	install -Dm0755 fish.completion ${DESTDIR}/usr/share/fish/vendor_completions.d/gopass.fish
 	vlicense LICENSE
 }