diff --git a/security/gopass/Makefile b/security/gopass/Makefile
index 6eb379bd4bfe..93c03b84959d 100644
--- a/security/gopass/Makefile
+++ b/security/gopass/Makefile
@@ -1,61 +1,58 @@
 PORTNAME=	gopass
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.15.6-3
-PORTREVISION=	1
+DISTVERSION=	1.15.7
 CATEGORIES=	security
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Rewrite of the pass password manager in Go
 WWW=		https://www.gopass.pw/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7
 ONLY_FOR_ARCHS_REASON=	upstream only supports ${ONLY_FOR_ARCHS}
 
 RUN_DEPENDS=	git:devel/git \
 		gpg2:security/gnupg
 
 USES=		go:modules
 
 # Usage examples are in a separate repo
 USE_GITHUB=	nodefault
 GH_TUPLE=	gopasspw:password-store-example:8db75ba3b69c:password_store_example
 
-# v1.15.6-3-g8c666a93, fix go module
-# See also: https://github.com/gopasspw/gopass/commit/8c666a93d844015cca992be0ab0c39992bb096ed
-GO_MODULE=	github.com/gopasspw/gopass@v0.0.0-20230801080807-8c666a93d844
+GO_MODULE=	github.com/gopasspw/gopass
 
 PORTDOCS=	README.md docs/*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-build:
 .for SHELL in bash fish zsh
 	${GO_WRKDIR_BIN}/${PORTNAME} completion ${SHELL} > ${WRKSRC}/${SHELL}
 .endfor
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/bash \
 		${STAGEDIR}${PREFIX}/etc/bash_completion.d/${PORTNAME}.sh
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions
 	${INSTALL_DATA} ${WRKSRC}/fish \
 		${STAGEDIR}${PREFIX}/share/fish/completions/${PORTNAME}.fish
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/zsh \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_${PORTNAME}
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC_password_store_example} && ${COPYTREE_SHARE} "README.md secrets templates" ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/security/gopass/distinfo b/security/gopass/distinfo
index 51c8ca59d5cc..b3537e138455 100644
--- a/security/gopass/distinfo
+++ b/security/gopass/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1691049740
-SHA256 (go/security_gopass/gopass-v1.15.6-3/v0.0.0-20230801080807-8c666a93d844.mod) = 21d2197302088488be57ec86e9ed8d96335faf519904f0915dfe22d6c6b3d819
-SIZE (go/security_gopass/gopass-v1.15.6-3/v0.0.0-20230801080807-8c666a93d844.mod) = 3993
-SHA256 (go/security_gopass/gopass-v1.15.6-3/v0.0.0-20230801080807-8c666a93d844.zip) = d63c8327f1055c2b64bd61890d760326bd22261d6279436c540e693c0dec648e
-SIZE (go/security_gopass/gopass-v1.15.6-3/v0.0.0-20230801080807-8c666a93d844.zip) = 2591054
-SHA256 (go/security_gopass/gopass-v1.15.6-3/gopasspw-password-store-example-8db75ba3b69c_GH0.tar.gz) = e2866f4749e844ea9f7d31386f971dd8bbf19acab2c0a06fe7c4e99462eda1c5
-SIZE (go/security_gopass/gopass-v1.15.6-3/gopasspw-password-store-example-8db75ba3b69c_GH0.tar.gz) = 1392
+TIMESTAMP = 1691228373
+SHA256 (go/security_gopass/gopass-v1.15.7/v1.15.7.mod) = 6891038f41c9cbacb8d9814254304a6c061af28e3eb4dbc50d2db56b99e7f549
+SIZE (go/security_gopass/gopass-v1.15.7/v1.15.7.mod) = 3993
+SHA256 (go/security_gopass/gopass-v1.15.7/v1.15.7.zip) = 5e579eb6b1ef2fc40aacc9fbc37c9bac71a38a133ba33563b38b8d6290b4f146
+SIZE (go/security_gopass/gopass-v1.15.7/v1.15.7.zip) = 2559472
+SHA256 (go/security_gopass/gopass-v1.15.7/gopasspw-password-store-example-8db75ba3b69c_GH0.tar.gz) = e2866f4749e844ea9f7d31386f971dd8bbf19acab2c0a06fe7c4e99462eda1c5
+SIZE (go/security_gopass/gopass-v1.15.7/gopasspw-password-store-example-8db75ba3b69c_GH0.tar.gz) = 1392