diff --git a/security/gopass/Makefile b/security/gopass/Makefile
index e41c4d76dc36..a3649adbcf55 100644
--- a/security/gopass/Makefile
+++ b/security/gopass/Makefile
@@ -1,57 +1,63 @@
 PORTNAME=	gopass
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.14.10
+PORTREVISION=	1
 CATEGORIES=	security
 
+PATCH_SITES=	https://github.com/gopasspw/gopass/commit/
+PATCHFILES=	ce3c52182a198e35cb504835e8e7800a04a95a96.patch:-p1 \
+		7d58b78e9bfc1dff600e777eb9c0b37b2169482f.patch:-p1 # Handle vi variants, https://github.com/gopasspw/gopass/issues/2412
+
 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 02bb7ac49887..7972b0f6f0a9 100644
--- a/security/gopass/distinfo
+++ b/security/gopass/distinfo
@@ -1,7 +1,11 @@
-TIMESTAMP = 1668027733
+TIMESTAMP = 1669121279
 SHA256 (go/security_gopass/gopass-v1.14.10/v1.14.10.mod) = ea47728492ca845bd18a7cc03f443a3e39f1715effaf4e33e353ce82b7a9ab0e
 SIZE (go/security_gopass/gopass-v1.14.10/v1.14.10.mod) = 2967
 SHA256 (go/security_gopass/gopass-v1.14.10/v1.14.10.zip) = f69c2777c49bd10371537c24f6521339784cac594c44e4b927962a4e3dd87602
 SIZE (go/security_gopass/gopass-v1.14.10/v1.14.10.zip) = 2489187
 SHA256 (go/security_gopass/gopass-v1.14.10/gopasspw-password-store-example-8db75ba3b69c_GH0.tar.gz) = e2866f4749e844ea9f7d31386f971dd8bbf19acab2c0a06fe7c4e99462eda1c5
 SIZE (go/security_gopass/gopass-v1.14.10/gopasspw-password-store-example-8db75ba3b69c_GH0.tar.gz) = 1392
+SHA256 (go/security_gopass/gopass-v1.14.10/ce3c52182a198e35cb504835e8e7800a04a95a96.patch) = 02bcc2b68c5b262db0205e3817a1c48425bfb56deab554cb5111942c16ca415b
+SIZE (go/security_gopass/gopass-v1.14.10/ce3c52182a198e35cb504835e8e7800a04a95a96.patch) = 3957
+SHA256 (go/security_gopass/gopass-v1.14.10/7d58b78e9bfc1dff600e777eb9c0b37b2169482f.patch) = ca5c469d4f28e700d7fb691722126e11313334689ec09c2b0a27c2babdf962be
+SIZE (go/security_gopass/gopass-v1.14.10/7d58b78e9bfc1dff600e777eb9c0b37b2169482f.patch) = 1728