diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 0e02c9550020..1530ad2a3327 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	mutt
 DISTVERSION=	2.2.12
+PORTREVISION=	1
 CATEGORIES+=	mail
 MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
 		https://bitbucket.org/mutt/mutt/downloads/
@@ -20,6 +21,7 @@ USE_PERL5=	build
 SHEBANG_FILES=	contrib/smime_keys_test.pl doc/gen-map-doc smime_keys.pl
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--disable-fcntl \
 		--enable-compressed \
 		--enable-external-dotlock \
@@ -166,7 +168,7 @@ URLVIEW_RUN_DEPENDS=	urlview:textproc/urlview
 .include <bsd.port.options.mk>
 
 post-install:
-	${INSTALL_MAN} ${FILESDIR}/mailcap.5 ${STAGEDIR}${MANPREFIX}/man/man5
+	${INSTALL_MAN} ${FILESDIR}/mailcap.5 ${STAGEDIR}${PREFIX}/share/man/man5
 
 pre-configure::
 # Stop make from setgid mutt_dotlock
diff --git a/mail/mutt/pkg-plist b/mail/mutt/pkg-plist
index cf570ad3820e..1921efa870a7 100644
--- a/mail/mutt/pkg-plist
+++ b/mail/mutt/pkg-plist
@@ -6,15 +6,15 @@ bin/mutt_pgpring
 bin/pgpewrap
 bin/smime_keys
 @sample etc/Muttrc.sample
-man/man1/mutt.1.gz
-man/man1/mutt_dotlock.1.gz
-man/man1/mutt_pgpring.1.gz
-man/man1/pgpewrap.1.gz
-man/man1/smime_keys.1.gz
-man/man5/mailcap.5.gz
-%%MAILBOX_MANPAGES%%man/man5/mbox.5.gz
-%%MAILBOX_MANPAGES%%man/man5/mmdf.5.gz
-man/man5/muttrc.5.gz
+share/man/man1/mutt.1.gz
+share/man/man1/mutt_dotlock.1.gz
+share/man/man1/mutt_pgpring.1.gz
+share/man/man1/pgpewrap.1.gz
+share/man/man1/smime_keys.1.gz
+share/man/man5/mailcap.5.gz
+%%MAILBOX_MANPAGES%%share/man/man5/mbox.5.gz
+%%MAILBOX_MANPAGES%%share/man/man5/mmdf.5.gz
+share/man/man5/muttrc.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/GPL