diff --git a/security/gopass/Makefile b/security/gopass/Makefile
index 175ad4c30554..5b07f8ac62c3 100644
--- a/security/gopass/Makefile
+++ b/security/gopass/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gopass
-PORTVERSION=	1.7.2
+PORTVERSION=	1.8.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	security
 
@@ -12,12 +12,13 @@ COMMENT=	Gopass is a rewrite of the pass password manager in Go
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	gpg2:security/gnupg
+RUN_DEPENDS=	git:devel/git \
+		gpg2:security/gnupg
 
 USES=		go
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	justwatchcom
+GH_ACCOUNT=	gopasspw
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
 
diff --git a/security/gopass/distinfo b/security/gopass/distinfo
index 53246b87a616..24c25fe35ca1 100644
--- a/security/gopass/distinfo
+++ b/security/gopass/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527534180
-SHA256 (justwatchcom-gopass-v1.7.2_GH0.tar.gz) = 71fece96684e36f4765e913bf30bf93c9bf7a1df9638b9187732d49d8b2f22cb
-SIZE (justwatchcom-gopass-v1.7.2_GH0.tar.gz) = 5929128
+TIMESTAMP = 1529309385
+SHA256 (gopasspw-gopass-v1.8.1_GH0.tar.gz) = 14b016112abaf18427d58009e61999a7d2aff2d49df9a4458ab572532d4b05e8
+SIZE (gopasspw-gopass-v1.8.1_GH0.tar.gz) = 5953043