diff --git a/mail/notmuch-emacs/Makefile b/mail/notmuch-emacs/Makefile
index b17014f121ad..6c30047d8f8f 100644
--- a/mail/notmuch-emacs/Makefile
+++ b/mail/notmuch-emacs/Makefile
@@ -1,79 +1,79 @@
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	mail elisp
 PKGNAMESUFFIX=	-emacs
 COMMENT=	Emacs major-mode for the Notmuch email search and tagging application
 WWW=		https://notmuchmail.org/notmuch-emacs/
 
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	notmuch:mail/notmuch
 
 USES=		emacs:build gmake
 
 INSTALL_TARGET=	install-emacs
 MASTERDIR=	${.CURDIR}/../notmuch
 
 CONFLICTS_INSTALL=	notmuch-emacs_*
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DESKTOP DOCS MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=	yes
 
 DESKTOP_DESC=	Install .desktop file for notmuch-emacs-mua
 
 DESKTOP_CONFIGURE_ON=	WITH_DESKTOP=1
 DESKTOP_USES=	desktop-file-utils
 DOCS_ALL_TARGET=	build-info
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 DOCS_CONFIGURE_ON=	HAVE_INSTALL_INFO=1 HAVE_MAKEINFO=1 HAVE_SPHINX=1
 DOCS_INFO=	notmuch-emacs
 DOCS_INSTALL_TARGET=	install-info
 DOCS_USES=	makeinfo
 MANPAGES_ALL_TARGET=	build-man
 MANPAGES_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx
 MANPAGES_CONFIGURE_ON=	HAVE_SPHINX=1
 MANPAGES_INSTALL_TARGET=	install-man
 
 PORTSCOUT=	limit:^[0-9\.]*$$
 
 # fake ./configure to avoid unneeded dependencies
 do-configure:
 	@${CP} ${WRKSRC}/version.txt ${WRKSRC}/version.stamp
 	@${ECHO_CMD} 'quiet=$$($$(word 1, $$(1)))' > ${WRKSRC}/Makefile.local
 	@${PRINTF} \
 		'%s\n' \
 		BASH_ABSOLUTE=/bin/sh \
 		desktop_dir=${PREFIX}/share/applications \
-		emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR} \
-		emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR} \
+		emacsetcdir=${PREFIX}/${EMACS_SITE_LISPDIR}/notmuch \
+		emacslispdir=${PREFIX}/${EMACS_SITE_LISPDIR}/notmuch \
 		HAVE_BASH=1 \
 		HAVE_EMACS=1 \
 		infodir=${PREFIX}/${INFO_PATH} \
 		mandir=${PREFIX}/share/man \
 		NOTMUCH_SRCDIR=${WRKSRC} \
 		prefix=${PREFIX} \
 		srcdir=. \
 		subdirs='doc emacs' \
 		WITH_EMACS=1 \
 		${CONFIGURE_ARGS} \
 		> ${WRKSRC}/Makefile.config
 	@${PRINTF} "tags.add('WITH_EMACS')\nrsti_dir = '${WRKSRC}/emacs'\n" \
 		> ${WRKSRC}/sphinx.config
 
 post-install:
-	@${FIND} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR} -name "*.elc" -delete
-	@${GZIP_CMD} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/*.el
+	@${FIND} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/notmuch -name "*.elc" -delete
+	@${GZIP_CMD} ${STAGEDIR}${PREFIX}/${EMACS_SITE_LISPDIR}/notmuch/*.el
 
 # keep poudriere testport happy
 post-install-DOCS-on:
 	@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} ! -type d ! -name notmuch-emacs.info -delete
 
 post-install-MANPAGES-on:
 	@${FIND} ${STAGEDIR}${PREFIX}/share/man ! -type d ! -name notmuch-emacs-mua.1.gz -delete
 
 # modify what Mk/Uses/emacs.mk set
 MAKE_ARGS+=	EMACS=EMACS+=--quick
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/notmuch-emacs/pkg-plist b/mail/notmuch-emacs/pkg-plist
index 03a934cfeffa..99104b78336c 100644
--- a/mail/notmuch-emacs/pkg-plist
+++ b/mail/notmuch-emacs/pkg-plist
@@ -1,26 +1,26 @@
 %%DESKTOP%%share/applications/notmuch-emacs-mua.desktop
-%%EMACS_SITE_LISPDIR%%/coolj.el.gz
-%%EMACS_SITE_LISPDIR%%/notmuch-address.el.gz
-%%EMACS_SITE_LISPDIR%%/notmuch-autoloads.el.gz
-%%EMACS_SITE_LISPDIR%%/notmuch-company.el.gz
-%%EMACS_SITE_LISPDIR%%/notmuch-compat.el.gz
-%%EMACS_SITE_LISPDIR%%/notmuch-crypto.el.gz
-%%EMACS_SITE_LISPDIR%%/notmuch-draft.el.gz
-%%EMACS_SITE_LISPDIR%%/notmuch-hello.el.gz
-%%EMACS_SITE_LISPDIR%%/notmuch-jump.el.gz
-%%EMACS_SITE_LISPDIR%%/notmuch-lib.el.gz
-%%EMACS_SITE_LISPDIR%%/notmuch-logo.svg
-%%EMACS_SITE_LISPDIR%%/notmuch-maildir-fcc.el.gz
-%%EMACS_SITE_LISPDIR%%/notmuch-message.el.gz
-%%EMACS_SITE_LISPDIR%%/notmuch-mua.el.gz
-%%EMACS_SITE_LISPDIR%%/notmuch-parser.el.gz
-%%EMACS_SITE_LISPDIR%%/notmuch-print.el.gz
-%%EMACS_SITE_LISPDIR%%/notmuch-query.el.gz
-%%EMACS_SITE_LISPDIR%%/notmuch-show.el.gz
-%%EMACS_SITE_LISPDIR%%/notmuch-tag.el.gz
-%%EMACS_SITE_LISPDIR%%/notmuch-tree.el.gz
-%%EMACS_SITE_LISPDIR%%/notmuch-version.el.gz
-%%EMACS_SITE_LISPDIR%%/notmuch-wash.el.gz
-%%EMACS_SITE_LISPDIR%%/notmuch.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch/coolj.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-address.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-autoloads.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-company.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-compat.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-crypto.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-draft.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-hello.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-jump.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-lib.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-logo.svg
+%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-maildir-fcc.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-message.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-mua.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-parser.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-print.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-query.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-show.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-tag.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-tree.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-version.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch/notmuch-wash.el.gz
+%%EMACS_SITE_LISPDIR%%/notmuch/notmuch.el.gz
 %%MANPAGES%%share/man/man1/notmuch-emacs-mua.1.gz
 bin/notmuch-emacs-mua