diff --git a/mail/asmail/Makefile b/mail/asmail/Makefile
index 92f36f485758..337844551dbc 100644
--- a/mail/asmail/Makefile
+++ b/mail/asmail/Makefile
@@ -1,51 +1,52 @@
 PORTNAME=	asmail
 PORTVERSION=	2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	mail afterstep
 MASTER_SITES=	AFTERSTEP/apps/asmail/ \
 		http://tigr.net/afterstep/download/asmail/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Biff-type program, designed to match AfterStep
 WWW=		https://tigr.net/afterstep/
 
 USES=		ssl xorg
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--enable-shaping \
 		--with-xpm \
 		--with-xpm-includes=${LOCALBASE}/include \
 		--with-xpm-library=${LOCALBASE}/lib
 
 LDFLAGS+=	-pthread -L${OPENSSLLIB} -lssl -lcrypto
 CPPFLAGS+=	-I${OPENSSLINC}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|-lpthread|-pthread|g ; \
 		 s|machine/soundcard|sys/soundcard|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		'/STRIP/s|^|#| ; \
 		 s| \($$(AFTER_.*DIR)\)| $$(DESTDIR)\1| ; \
 		 s|\.\([0-9]\)x|.\1|' \
 		${WRKSRC}/autoconf/Makefile.common.in
 	@${REINPLACE_CMD} -e \
 		's|@CFLAGS@ -D|@CFLAGS@ @CPPFLAGS@ -D|g ; \
 		 s|-lpthread -lrt|@LDFLAGS@|g' \
 		${WRKSRC}/autoconf/Makefile.defines.in
 	@${REINPLACE_CMD} -e \
 		's|/usr/local|${PREFIX}|g' \
 		${WRKSRC}/asmailrc.sample
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} README \
 		${STAGEDIR}${DOCSDIR})
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} asmailrc.sample \
 		${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/mail/asmail/pkg-plist b/mail/asmail/pkg-plist
index bd6df58ee40f..ba87d29033db 100644
--- a/mail/asmail/pkg-plist
+++ b/mail/asmail/pkg-plist
@@ -1,70 +1,70 @@
 bin/asmail
-man/man1/asmail.1.gz
-man/man5/asmailrc.5.gz
+share/man/man1/asmail.1.gz
+share/man/man5/asmailrc.5.gz
 %%DATADIR%%/pixmaps/e-no.xpm
 %%DATADIR%%/pixmaps/e0.xpm
 %%DATADIR%%/pixmaps/e1.xpm
 %%DATADIR%%/pixmaps/e10.xpm
 %%DATADIR%%/pixmaps/e11.xpm
 %%DATADIR%%/pixmaps/e12.xpm
 %%DATADIR%%/pixmaps/e13.xpm
 %%DATADIR%%/pixmaps/e14.xpm
 %%DATADIR%%/pixmaps/e15.xpm
 %%DATADIR%%/pixmaps/e16.xpm
 %%DATADIR%%/pixmaps/e17.xpm
 %%DATADIR%%/pixmaps/e18.xpm
 %%DATADIR%%/pixmaps/e19.xpm
 %%DATADIR%%/pixmaps/e2.xpm
 %%DATADIR%%/pixmaps/e20.xpm
 %%DATADIR%%/pixmaps/e21.xpm
 %%DATADIR%%/pixmaps/e22.xpm
 %%DATADIR%%/pixmaps/e23.xpm
 %%DATADIR%%/pixmaps/e24.xpm
 %%DATADIR%%/pixmaps/e25.xpm
 %%DATADIR%%/pixmaps/e26.xpm
 %%DATADIR%%/pixmaps/e27.xpm
 %%DATADIR%%/pixmaps/e28.xpm
 %%DATADIR%%/pixmaps/e29.xpm
 %%DATADIR%%/pixmaps/e3.xpm
 %%DATADIR%%/pixmaps/e30.xpm
 %%DATADIR%%/pixmaps/e4.xpm
 %%DATADIR%%/pixmaps/e5.xpm
 %%DATADIR%%/pixmaps/e6.xpm
 %%DATADIR%%/pixmaps/e7.xpm
 %%DATADIR%%/pixmaps/e8.xpm
 %%DATADIR%%/pixmaps/e9.xpm
 %%DATADIR%%/pixmaps/m-e0.xpm
 %%DATADIR%%/pixmaps/m-e1.xpm
 %%DATADIR%%/pixmaps/m-e10.xpm
 %%DATADIR%%/pixmaps/m-e11.xpm
 %%DATADIR%%/pixmaps/m-e12.xpm
 %%DATADIR%%/pixmaps/m-e13.xpm
 %%DATADIR%%/pixmaps/m-e14.xpm
 %%DATADIR%%/pixmaps/m-e15.xpm
 %%DATADIR%%/pixmaps/m-e16.xpm
 %%DATADIR%%/pixmaps/m-e17.xpm
 %%DATADIR%%/pixmaps/m-e18.xpm
 %%DATADIR%%/pixmaps/m-e19.xpm
 %%DATADIR%%/pixmaps/m-e2.xpm
 %%DATADIR%%/pixmaps/m-e20.xpm
 %%DATADIR%%/pixmaps/m-e21.xpm
 %%DATADIR%%/pixmaps/m-e22.xpm
 %%DATADIR%%/pixmaps/m-e23.xpm
 %%DATADIR%%/pixmaps/m-e24.xpm
 %%DATADIR%%/pixmaps/m-e25.xpm
 %%DATADIR%%/pixmaps/m-e26.xpm
 %%DATADIR%%/pixmaps/m-e27.xpm
 %%DATADIR%%/pixmaps/m-e28.xpm
 %%DATADIR%%/pixmaps/m-e29.xpm
 %%DATADIR%%/pixmaps/m-e3.xpm
 %%DATADIR%%/pixmaps/m-e30.xpm
 %%DATADIR%%/pixmaps/m-e4.xpm
 %%DATADIR%%/pixmaps/m-e5.xpm
 %%DATADIR%%/pixmaps/m-e6.xpm
 %%DATADIR%%/pixmaps/m-e7.xpm
 %%DATADIR%%/pixmaps/m-e8.xpm
 %%DATADIR%%/pixmaps/m-e9.xpm
 %%DATADIR%%/sounds/clink.au
 %%DATADIR%%/sounds/drip.au
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/asmailrc.sample