diff --git a/mail/notmuch-mutt/Makefile b/mail/notmuch-mutt/Makefile
index b7646a137453..6b0312cf1657 100644
--- a/mail/notmuch-mutt/Makefile
+++ b/mail/notmuch-mutt/Makefile
@@ -1,38 +1,39 @@
+PORTREVISION=	1
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-mutt
 
 COMMENT=	Integrates the Notmuch email search and tagging application with Mutt
 WWW=		https://notmuchmail.org/notmuch-mutt/
 
 RUN_DEPENDS=	mutt:mail/mutt \
 		notmuch:mail/notmuch \
 		p5-Mail-Box>0:mail/p5-Mail-Box \
 		p5-Mail-Tools>0:mail/p5-Mail-Tools \
 		p5-String-ShellQuote>0:textproc/p5-String-ShellQuote \
 		p5-Term-ReadLine-Gnu>0:devel/p5-Term-ReadLine-Gnu
 
 USES=		gmake perl5
 
-MAKE_ARGS+=	mandir=${MANPREFIX}/man prefix=${PREFIX}
+MAKE_ARGS+=	mandir=${PREFIX}/share/man prefix=${PREFIX}
 MASTERDIR=	${.CURDIR}/../notmuch
 NO_ARCH=	yes
 WRKSRC_SUBDIR=	contrib/notmuch-mutt
 
 OPTIONS_DEFINE=	EXAMPLES MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 OPTIONS_SUB=	yes
 
 PORTSCOUT=	limit:^[0-9\.]*$$
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${MV} ${STAGEDIR}${PREFIX}/etc/Muttrc.d/notmuch-mutt.rc ${STAGEDIR}${EXAMPLESDIR}/notmuch-mutt.rc
 	@${RMDIR} ${STAGEDIR}${PREFIX}/etc/Muttrc.d
 
 post-install-EXAMPLES-off:
 	@${RM} -r ${STAGEDIR}${PREFIX}/etc/Muttrc.d
 
 post-install-MANPAGES-off:
-	@${RM} ${STAGEDIR}${MANPREFIX}/man/man1/notmuch-mutt.1
+	@${RM} ${STAGEDIR}${PREFIX}/share/man/man1/notmuch-mutt.1
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/notmuch-mutt/pkg-plist b/mail/notmuch-mutt/pkg-plist
index 6a399a0c893a..4b60d72e7a73 100644
--- a/mail/notmuch-mutt/pkg-plist
+++ b/mail/notmuch-mutt/pkg-plist
@@ -1,3 +1,3 @@
-%%MANPAGES%%man/man1/notmuch-mutt.1.gz
+%%MANPAGES%%share/man/man1/notmuch-mutt.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/notmuch-mutt.rc
 bin/notmuch-mutt