diff --git a/security/gopass/Makefile b/security/gopass/Makefile
index b0ce1f8f84bb..50b5c4557010 100644
--- a/security/gopass/Makefile
+++ b/security/gopass/Makefile
@@ -1,59 +1,58 @@
 PORTNAME=	gopass
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.15.15
-PORTREVISION=	3
+DISTVERSION=	1.15.16
 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:1.23,modules
+USES=		go:1.24,modules
 
 # Usage examples are in a separate repo
 USE_GITHUB=	nodefault
 GH_TUPLE=	gopasspw:password-store-example:8db75ba3b69c:password_store_example
-
 GO_MODULE=	github.com/gopasspw/gopass
+GO_BUILDFLAGS=	-ldflags "-X main.version=${DISTVERSION}"
 
 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 55ee55d41b48..e59dd7795986 100644
--- a/security/gopass/distinfo
+++ b/security/gopass/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1732471262
-SHA256 (go/security_gopass/gopass-v1.15.15/v1.15.15.mod) = 0586b7113956c5e470535b6c376a354bdd6ad79e6f1b7362f7124fb50731e160
-SIZE (go/security_gopass/gopass-v1.15.15/v1.15.15.mod) = 3725
-SHA256 (go/security_gopass/gopass-v1.15.15/v1.15.15.zip) = 2131c0287894bcd92780f27d30b5da706d1726d0f7493d990871ef9a313c8ae1
-SIZE (go/security_gopass/gopass-v1.15.15/v1.15.15.zip) = 2594365
-SHA256 (go/security_gopass/gopass-v1.15.15/gopasspw-password-store-example-8db75ba3b69c_GH0.tar.gz) = e2866f4749e844ea9f7d31386f971dd8bbf19acab2c0a06fe7c4e99462eda1c5
-SIZE (go/security_gopass/gopass-v1.15.15/gopasspw-password-store-example-8db75ba3b69c_GH0.tar.gz) = 1392
+TIMESTAMP = 1745272105
+SHA256 (go/security_gopass/gopass-v1.15.16/v1.15.16.mod) = e0f570e6e6fe7b74c149e38167cb1b062def7edfd39bbf58202bfd9228e8b76c
+SIZE (go/security_gopass/gopass-v1.15.16/v1.15.16.mod) = 4250
+SHA256 (go/security_gopass/gopass-v1.15.16/v1.15.16.zip) = 952169822333155f4d0a7a02c06b5cd7b6126980e942facd1014914333e57401
+SIZE (go/security_gopass/gopass-v1.15.16/v1.15.16.zip) = 2608952
+SHA256 (go/security_gopass/gopass-v1.15.16/gopasspw-password-store-example-8db75ba3b69c_GH0.tar.gz) = e2866f4749e844ea9f7d31386f971dd8bbf19acab2c0a06fe7c4e99462eda1c5
+SIZE (go/security_gopass/gopass-v1.15.16/gopasspw-password-store-example-8db75ba3b69c_GH0.tar.gz) = 1392