diff --git a/mail/notmuch/Makefile b/mail/notmuch/Makefile
index 564ecad73706..a6cc6af0170e 100644
--- a/mail/notmuch/Makefile
+++ b/mail/notmuch/Makefile
@@ -1,90 +1,90 @@
 PORTNAME=	notmuch
 DISTVERSION=	0.38.2
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	mail
 MASTER_SITES=	https://notmuchmail.org/releases/
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT?=	Thread-based email index, search and tagging application
 WWW?=		https://notmuchmail.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g}/COPYING-GPL-3
 
 .ifndef MASTERDIR
 LIB_DEPENDS=	libgmime-3.0.so:mail/gmime30 \
 		libsexp.so:devel/sfsexp \
 		libtalloc.so:devel/talloc \
 		libxapian.so:databases/xapian-core
 TEST_DEPENDS=	${LOCALBASE}/bin/gdb:devel/gdb \
 		bash:shells/bash \
 		dtach:misc/dtach \
 		emacs:editors/emacs@nox \
 		gbase64:sysutils/coreutils \
 		gdate:sysutils/coreutils \
 		gpg:security/gnupg \
 		gsed:textproc/gsed \
 		gsha256sum:sysutils/coreutils \
 		gwc:sysutils/coreutils
 
 USES=		gmake gnome pkgconfig python:build,test
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 .endif
 
 USES+=		tar:xz
 
 .ifndef MASTERDIR
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--infodir=${PREFIX}/${INFO_PATH} \
-		--mandir=${MANPREFIX}/man \
+		--mandir=${PREFIX}/share/man \
 		--prefix=${PREFIX} \
 		--with-bash-completion \
 		--with-retry-lock \
 		--with-zsh-completion \
 		--without-emacs
 CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
 TEST_ENV+=	NOTMUCH_SKIP_TESTS="basic.12 count.14 insert.2[89] insert.3[0-9] message-property.6 regexp-query.21" \
 		TEST_CFLAGS="-g -O0 -I${LOCALBASE}/include -L${LOCALBASE}/lib" \
 		TEST_GDB=${LOCALBASE}/bin/gdb \
 		V=1
 TEST_TARGET=	test
 .endif
 
 PKGDIR=		${.CURDIR}
 .ifndef MASTERDIR
 PORTSCOUT=	limit:^[0-9\.]*$$
 .endif
 
 PATCH_WRKSRC=	${WRKSRC}/${WRKSRC_SUBDIR:C/[^\/]+/../g}
 
 .ifndef MASTERDIR
 OPTIONS_DEFINE=		DOXYGEN MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=		yes
 
 DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen
 DOXYGEN_USES=			perl5
 DOXYGEN_CONFIGURE_WITH=		api-docs
 MANPAGES_BUILD_DEPENDS=		sphinx-build:textproc/py-sphinx
 MANPAGES_CONFIGURE_WITH=	docs
 
 # Install bash completions without incurring a dependency on
 # shells/bash-completion.
 post-configure:
 	${REINPLACE_CMD} \
 		-e '/^BASH_ABSOLUTE[[:blank:]]*=/s|=.*|=${LOCALBASE}/bin/bash|' \
 		-e '/^HAVE_BASH[[:blank:]]*=/s/=.*/=1/' \
 		-e '/^WITH_BASH[[:blank:]]*=/s/=.*/=1/' \
 		${WRKSRC}/Makefile.config
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/notmuch
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnotmuch.so.?*.?*.?*
 
 # Keep poudriere-testport(8) happy.
 post-install-MANPAGES-on:
-	@${RM} ${STAGEDIR}${MANPREFIX}/man/man1/notmuch-emacs-mua.1.gz
+	@${RM} ${STAGEDIR}${PREFIX}/share/man/man1/notmuch-emacs-mua.1.gz
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/notmuch/pkg-plist b/mail/notmuch/pkg-plist
index 54a1722e9d87..c576dfb61f5b 100644
--- a/mail/notmuch/pkg-plist
+++ b/mail/notmuch/pkg-plist
@@ -1,30 +1,30 @@
-%%DOXYGEN%%man/man3/notmuch.3.gz
-%%MANPAGES%%man/man1/notmuch-address.1.gz
-%%MANPAGES%%man/man1/notmuch-compact.1.gz
-%%MANPAGES%%man/man1/notmuch-config.1.gz
-%%MANPAGES%%man/man1/notmuch-count.1.gz
-%%MANPAGES%%man/man1/notmuch-dump.1.gz
-%%MANPAGES%%man/man1/notmuch-insert.1.gz
-%%MANPAGES%%man/man1/notmuch-new.1.gz
-%%MANPAGES%%man/man1/nmbug.1.gz
-%%MANPAGES%%man/man1/notmuch-git.1.gz
-%%MANPAGES%%man/man1/notmuch-reindex.1.gz
-%%MANPAGES%%man/man1/notmuch-reply.1.gz
-%%MANPAGES%%man/man1/notmuch-restore.1.gz
-%%MANPAGES%%man/man1/notmuch-search.1.gz
-%%MANPAGES%%man/man1/notmuch-setup.1.gz
-%%MANPAGES%%man/man1/notmuch-show.1.gz
-%%MANPAGES%%man/man1/notmuch-tag.1.gz
-%%MANPAGES%%man/man1/notmuch.1.gz
-%%MANPAGES%%man/man5/notmuch-hooks.5.gz
-%%MANPAGES%%man/man7/notmuch-properties.7.gz
-%%MANPAGES%%man/man7/notmuch-search-terms.7.gz
-%%MANPAGES%%man/man7/notmuch-sexp-queries.7.gz
+%%DOXYGEN%%share/man/man3/notmuch.3.gz
+%%MANPAGES%%share/man/man1/notmuch-address.1.gz
+%%MANPAGES%%share/man/man1/notmuch-compact.1.gz
+%%MANPAGES%%share/man/man1/notmuch-config.1.gz
+%%MANPAGES%%share/man/man1/notmuch-count.1.gz
+%%MANPAGES%%share/man/man1/notmuch-dump.1.gz
+%%MANPAGES%%share/man/man1/notmuch-insert.1.gz
+%%MANPAGES%%share/man/man1/notmuch-new.1.gz
+%%MANPAGES%%share/man/man1/nmbug.1.gz
+%%MANPAGES%%share/man/man1/notmuch-git.1.gz
+%%MANPAGES%%share/man/man1/notmuch-reindex.1.gz
+%%MANPAGES%%share/man/man1/notmuch-reply.1.gz
+%%MANPAGES%%share/man/man1/notmuch-restore.1.gz
+%%MANPAGES%%share/man/man1/notmuch-search.1.gz
+%%MANPAGES%%share/man/man1/notmuch-setup.1.gz
+%%MANPAGES%%share/man/man1/notmuch-show.1.gz
+%%MANPAGES%%share/man/man1/notmuch-tag.1.gz
+%%MANPAGES%%share/man/man1/notmuch.1.gz
+%%MANPAGES%%share/man/man5/notmuch-hooks.5.gz
+%%MANPAGES%%share/man/man7/notmuch-properties.7.gz
+%%MANPAGES%%share/man/man7/notmuch-search-terms.7.gz
+%%MANPAGES%%share/man/man7/notmuch-sexp-queries.7.gz
 bin/notmuch
 include/notmuch.h
 lib/libnotmuch.so
 lib/libnotmuch.so.5
 lib/libnotmuch.so.5.6.0
 share/bash-completion/completions/notmuch
 share/zsh/site-functions/_email-notmuch
 share/zsh/site-functions/_notmuch