diff --git a/mail/emil/Makefile b/mail/emil/Makefile
index f197bbae7179..f86e2abc1e66 100644
--- a/mail/emil/Makefile
+++ b/mail/emil/Makefile
@@ -1,24 +1,25 @@
 PORTNAME=	emil
 PORTVERSION=	2.1b9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.uu.se/pub/unix/networking/mail/emil/ \
 		ftp://ftp.gwdg.de/pub/misc/emil/ \
 		ftp://ftp.funet.fi/pub/unix/mail/emil/ \
 		ftp://ftp.enst.fr/pub/unix/network/mail/ \
 		ftp://sunsite.doc.ic.ac.uk/Mirrors/ftp.uu.se/pub/unix/networking/mail/emil/
 DISTNAME=	${PORTNAME}-2.1.0-beta9
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mail format/encoding converter
 
 USES=		cpe
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ENV=	YACC=byacc
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS_MAKE_ENV_OFF=	NOPORTDOCS=yes
 
 .include <bsd.port.mk>
diff --git a/mail/emil/pkg-plist b/mail/emil/pkg-plist
index 43383040331f..8d7af056a3b9 100644
--- a/mail/emil/pkg-plist
+++ b/mail/emil/pkg-plist
@@ -1,39 +1,39 @@
 bin/emil
 lib/charsets.cpl
 lib/emil.cf
-man/man1/emil.1.gz
-man/man1/emil.cf.1.gz
+share/man/man1/emil.1.gz
+share/man/man1/emil.cf.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/analysis.html
 %%PORTDOCS%%%%DOCSDIR%%/arguments.html
 %%PORTDOCS%%%%DOCSDIR%%/arrow_left3.gif
 %%PORTDOCS%%%%DOCSDIR%%/arrow_right3.gif
 %%PORTDOCS%%%%DOCSDIR%%/arrow_up2.gif
 %%PORTDOCS%%%%DOCSDIR%%/binpobox.gif
 %%PORTDOCS%%%%DOCSDIR%%/comparison.html
 %%PORTDOCS%%%%DOCSDIR%%/configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/control.html
 %%PORTDOCS%%%%DOCSDIR%%/design-spec.html
 %%PORTDOCS%%%%DOCSDIR%%/design-top.html
 %%PORTDOCS%%%%DOCSDIR%%/details.html
 %%PORTDOCS%%%%DOCSDIR%%/emil.cf.html
 %%PORTDOCS%%%%DOCSDIR%%/end.html
 %%PORTDOCS%%%%DOCSDIR%%/figure1.gif
 %%PORTDOCS%%%%DOCSDIR%%/figure2.gif
 %%PORTDOCS%%%%DOCSDIR%%/figure3.gif
 %%PORTDOCS%%%%DOCSDIR%%/figure4.gif
 %%PORTDOCS%%%%DOCSDIR%%/figure5.gif
 %%PORTDOCS%%%%DOCSDIR%%/figure6.gif
 %%PORTDOCS%%%%DOCSDIR%%/figure7.gif
 %%PORTDOCS%%%%DOCSDIR%%/index.shtml
 %%PORTDOCS%%%%DOCSDIR%%/input.html
 %%PORTDOCS%%%%DOCSDIR%%/intro.html
 %%PORTDOCS%%%%DOCSDIR%%/main.html
 %%PORTDOCS%%%%DOCSDIR%%/output.html
 %%PORTDOCS%%%%DOCSDIR%%/problem-statement.html
 %%PORTDOCS%%%%DOCSDIR%%/rfc1521.html
 %%PORTDOCS%%%%DOCSDIR%%/rfc1522.html
 %%PORTDOCS%%%%DOCSDIR%%/rfc822.html
 %%PORTDOCS%%%%DOCSDIR%%/setting.html
 %%PORTDOCS%%%%DOCSDIR%%/using.html
 %%PORTDOCS%%%%DOCSDIR%%/way.html
 %%PORTDOCS%%%%DOCSDIR%%/why.html