diff -ruN /usr/ports/sysutils/password-store/Makefile sysutils/password-store/Makefile
--- /usr/ports/sysutils/password-store/Makefile	2018-08-03 12:04:04.000000000 +0200
+++ sysutils/password-store/Makefile	2019-01-29 19:50:17.711443000 +0100
@@ -2,6 +2,7 @@
 
 PORTNAME=	password-store
 PORTVERSION=	1.7.3
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://git.zx2c4.com/password-store/snapshot/
 
@@ -42,14 +43,15 @@
 
 post-patch:
 	@${REINPLACE_CMD} -Ee 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/src/platform/freebsd.sh
-	@${REINPLACE_CMD} -Ee 's|^SYSTEM_EXTENSION_DIR=""|SYSTEM_EXTENSION_DIR="${PREFIX}/lib/password-store/extensions"|g' \
+	@${REINPLACE_CMD} -Ee 's|^SYSTEM_EXTENSION_DIR=""|SYSTEM_EXTENSION_DIR="${PREFIX}/libexec/password-store/extensions"|g' \
 		${WRKSRC}/src/password-store.sh
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/pass ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_SCRIPT} ${WRKSRC}/src/password-store.sh ${STAGEDIR}${PREFIX}/libexec/pass
-	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/platform
-	${INSTALL_SCRIPT} ${WRKSRC}/src/platform/freebsd.sh ${STAGEDIR}${PREFIX}/libexec/platform/
+	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/password-store/extensions
+	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/password-store/platform
+	${INSTALL_SCRIPT} ${WRKSRC}/src/password-store.sh ${STAGEDIR}${PREFIX}/libexec/password-store/pass
+	${INSTALL_SCRIPT} ${WRKSRC}/src/platform/freebsd.sh ${STAGEDIR}${PREFIX}/libexec/password-store/platform/
 	${INSTALL_MAN} ${WRKSRC}/man/pass.1 ${STAGEDIR}${MANPREFIX}/man/man1/pass.1
 
 do-install-CONTRIB-on:
diff -ruN /usr/ports/sysutils/password-store/files/pass.in sysutils/password-store/files/pass.in
--- /usr/ports/sysutils/password-store/files/pass.in	2017-05-09 15:27:38.000000000 +0200
+++ sysutils/password-store/files/pass.in	2019-01-29 19:38:14.130375000 +0100
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-cd %%PREFIX%%/libexec
-exec %%PREFIX%%/libexec/pass "$@"
+cd %%PREFIX%%/libexec/password-store
+exec %%PREFIX%%/libexec/password-store/pass "$@"
diff -ruN /usr/ports/sysutils/password-store/pkg-plist sysutils/password-store/pkg-plist
--- /usr/ports/sysutils/password-store/pkg-plist	2018-06-14 23:04:06.000000000 +0200
+++ sysutils/password-store/pkg-plist	2019-01-29 19:45:28.846754000 +0100
@@ -1,6 +1,6 @@
 bin/pass
-libexec/pass
-libexec/platform/freebsd.sh
+libexec/password-store/pass
+libexec/password-store/platform/freebsd.sh
 man/man1/pass.1.gz
 %%CONTRIB%%%%DATADIR%%/dmenu/README.md
 %%CONTRIB%%%%DATADIR%%/dmenu/passmenu
@@ -32,3 +32,4 @@
 %%CONTRIB%%share/fish/completions/password-store.fish
 %%CONTRIB%%share/zsh/site-functions/_pass
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-filter.sh
+@dir libexec/password-store/extensions