diff -ruN mail/mutt-devel~/Makefile mail/mutt-devel/Makefile
--- mail/mutt-devel~/Makefile	2008-08-20 01:56:56.000000000 +0100
+++ mail/mutt-devel/Makefile	2008-09-19 18:51:34.000000000 +0100
@@ -463,9 +463,15 @@
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
 MAN1=		mutt.1 mutt_dotlock.1 flea.1 muttbug.1
-MAN5=		muttrc.5 mbox.5 mmdf.5
+MAN5=		muttrc.5
+.if !defined(WITHOUT_MUTT_MAILBOX_MANPAGES)
+MAN5+=		mbox.5 mmdf.5
+.endif
 
 post-patch::
+.if defined(WITHOUT_MUTT_MAILBOX_MANPAGES)
+	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-no-mbox-manpage
+.endif
 	@${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \
 		${WRKSRC}/contrib/gpg.rc
 	@${REINPLACE_CMD} -e 's,pgp6,pgp,g' \
diff -ruN mail/mutt-devel~/files/extra-patch-no-mbox-manpage mail/mutt-devel/files/extra-patch-no-mbox-manpage
--- mail/mutt-devel~/files/extra-patch-no-mbox-manpage	1970-01-01 01:00:00.000000000 +0100
+++ mail/mutt-devel/files/extra-patch-no-mbox-manpage	2008-09-19 18:56:17.000000000 +0100
@@ -0,0 +1,29 @@
+--- doc/Makefile.am~	2008-05-30 08:00:04.000000000 +0100
++++ doc/Makefile.am	2008-09-19 18:55:55.000000000 +0100
+@@ -18,8 +18,6 @@
+ 	gen-map-doc			\
+ 	muttrc.man.head			\
+ 	muttrc.man.tail			\
+-	mbox.man			\
+-	mmdf.man			\
+ 	manual.xml.head			\
+ 	manual.xml.tail			\
+ 	instdoc.sh.in			\
+@@ -57,8 +55,6 @@
+ 	test x@DOTLOCK_TARGET@ = x || ./instdoc $(srcdir)/dotlock.man \
+ 		$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
+ 	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
+-	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
+-	./instdoc $(srcdir)/mmdf.man $(DESTDIR)$(mandir)/man5/mmdf.5
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
+ 	for f in $(topsrcdir_DOCFILES) ; do \
+ 		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
+@@ -83,7 +79,7 @@
+ 	for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \
+ 		rm -f $(DESTDIR)$(mandir)/man1/$$f ; \
+ 	done
+-	for f in muttrc.5 mbox.5 mmdf.5 ; do \
++	for f in muttrc.5 ; do \
+ 		rm -f $(DESTDIR)$(mandir)/man5/$$f ; \
+ 	done
+ 	for f in $(srcdir_DOCFILES) $(topsrcdir_DOCFILES) $(HTML_DOCFILES) ; \