diff --git a/security/gopass/Makefile b/security/gopass/Makefile
index ad7b1a7d274d..5f65c8ea87f1 100644
--- a/security/gopass/Makefile
+++ b/security/gopass/Makefile
@@ -1,62 +1,58 @@
 PORTNAME=	gopass
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.15.0
-PORTREVISION=	1
+DISTVERSION=	1.15.1
 CATEGORIES=	security
 
-PATCH_SITES=	https://github.com/gopasspw/gopass/pull/2456/commits/
-PATCHFILES=	3865a456ff5afcf1b065542d5df02390bc440142.patch:-p1 # Fix vi detection, https://github.com/gopasspw/gopass/issues/2424
-
 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=	amd64
 ONLY_FOR_ARCHS_REASON=	upstream only supports amd64
 
 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
 
 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 893f078c5786..1fe644531b79 100644
--- a/security/gopass/distinfo
+++ b/security/gopass/distinfo
@@ -1,9 +1,7 @@
-TIMESTAMP = 1670443681
-SHA256 (go/security_gopass/gopass-v1.15.0/v1.15.0.mod) = 0e7de42094253d1b0c97328d77f0cecfbf0f696e701a89d0d6fd622b0642d532
-SIZE (go/security_gopass/gopass-v1.15.0/v1.15.0.mod) = 2927
-SHA256 (go/security_gopass/gopass-v1.15.0/v1.15.0.zip) = 38e4478c379c77d60781d58f3024d3a83f339698258b01c77798e16ed4e84e03
-SIZE (go/security_gopass/gopass-v1.15.0/v1.15.0.zip) = 2510235
-SHA256 (go/security_gopass/gopass-v1.15.0/gopasspw-password-store-example-8db75ba3b69c_GH0.tar.gz) = e2866f4749e844ea9f7d31386f971dd8bbf19acab2c0a06fe7c4e99462eda1c5
-SIZE (go/security_gopass/gopass-v1.15.0/gopasspw-password-store-example-8db75ba3b69c_GH0.tar.gz) = 1392
-SHA256 (go/security_gopass/gopass-v1.15.0/3865a456ff5afcf1b065542d5df02390bc440142.patch) = e28aca2af38437f532766361e3e4dc8605b526dd00458ab447593e946d8f319d
-SIZE (go/security_gopass/gopass-v1.15.0/3865a456ff5afcf1b065542d5df02390bc440142.patch) = 1746
+TIMESTAMP = 1670837686
+SHA256 (go/security_gopass/gopass-v1.15.1/v1.15.1.mod) = badc09eefc39564818dc711dd04be8b72896e8c8ef0c7fb867aff7a3926d193e
+SIZE (go/security_gopass/gopass-v1.15.1/v1.15.1.mod) = 2912
+SHA256 (go/security_gopass/gopass-v1.15.1/v1.15.1.zip) = 45c205f606e721f01398bc307f5d3fad5966dd55660796dc0dc55f3d50a80a33
+SIZE (go/security_gopass/gopass-v1.15.1/v1.15.1.zip) = 2526566
+SHA256 (go/security_gopass/gopass-v1.15.1/gopasspw-password-store-example-8db75ba3b69c_GH0.tar.gz) = e2866f4749e844ea9f7d31386f971dd8bbf19acab2c0a06fe7c4e99462eda1c5
+SIZE (go/security_gopass/gopass-v1.15.1/gopasspw-password-store-example-8db75ba3b69c_GH0.tar.gz) = 1392
diff --git a/security/gopass/pkg-plist b/security/gopass/pkg-plist
index 707ab31049e2..063fa0940232 100644
--- a/security/gopass/pkg-plist
+++ b/security/gopass/pkg-plist
@@ -1,62 +1,63 @@
 bin/gopass
 etc/bash_completion.d/gopass.sh
 %%PORTDOCS%%%%DOCSDIR%%/backends.md
 %%PORTDOCS%%%%DOCSDIR%%/backends/age.md
 %%PORTDOCS%%%%DOCSDIR%%/backends/fs.md
 %%PORTDOCS%%%%DOCSDIR%%/backends/gitfs.md
 %%PORTDOCS%%%%DOCSDIR%%/backends/gpg.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/audit.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/cat.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/clone.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/config.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/convert.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/create.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/delete.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/edit.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/env.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/find.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/fsck.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/generate.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/gopass.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/grep.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/history.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/init.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/insert.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/link.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/list.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/mount.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/move.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/otp.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/process.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/pwgen.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/recipients.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/show.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/sync.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/templates.md
 %%PORTDOCS%%%%DOCSDIR%%/commands/update.md
 %%PORTDOCS%%%%DOCSDIR%%/components.dot
 %%PORTDOCS%%%%DOCSDIR%%/components.png
 %%PORTDOCS%%%%DOCSDIR%%/config.md
 %%PORTDOCS%%%%DOCSDIR%%/entropy.md
 %%PORTDOCS%%%%DOCSDIR%%/faq.md
 %%PORTDOCS%%%%DOCSDIR%%/features.md
 %%PORTDOCS%%%%DOCSDIR%%/hacking.md
 %%PORTDOCS%%%%DOCSDIR%%/logo-small.png
 %%PORTDOCS%%%%DOCSDIR%%/logo.ico
 %%PORTDOCS%%%%DOCSDIR%%/logo.png
 %%PORTDOCS%%%%DOCSDIR%%/logo.svg
 %%PORTDOCS%%%%DOCSDIR%%/releases.md
+%%PORTDOCS%%%%DOCSDIR%%/secrets.md
 %%PORTDOCS%%%%DOCSDIR%%/security.md
 %%PORTDOCS%%%%DOCSDIR%%/setup.md
 %%PORTDOCS%%%%DOCSDIR%%/showcase.png
 %%PORTDOCS%%%%DOCSDIR%%/usecases/gpaste.md
 %%PORTDOCS%%%%DOCSDIR%%/usecases/multi-store.md
 %%PORTDOCS%%%%DOCSDIR%%/usecases/readonly-store.md
 %%PORTDOCS%%%%DOCSDIR%%/usecases/secure-otp.md
 %%PORTDOCS%%%%DOCSDIR%%/usecases/secure-otp/Sign-In.png
 %%PORTDOCS%%%%DOCSDIR%%/usecases/secure-otp/Sign-Up.png
 %%PORTDOCS%%%%DOCSDIR%%/usecases/secure-otp/sign-in.puml
 %%PORTDOCS%%%%DOCSDIR%%/usecases/secure-otp/sign-up.puml
 share/fish/completions/gopass.fish
 share/man/man1/gopass.1.gz
 share/zsh/site-functions/_gopass