diff --git a/mail/mailest/Makefile b/mail/mailest/Makefile
index 2934edc25b94..dedf939d313d 100644
--- a/mail/mailest/Makefile
+++ b/mail/mailest/Makefile
@@ -1,54 +1,55 @@
 PORTNAME=	mailest
 PORTVERSION=	0.9.24
 DISTVERSIONPREFIX=	${PORTNAME}-
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	mail
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Hyper Estraier backend for Mew
 WWW=		https://github.com/yasuoka/mailest
 
 LICENSE=	BSD2CLAUSE BSD3CLAUSE ISCL LGPL21
 LICENSE_COMB=	multi
 .for L in ${LICENSE}
 LICENSE_FILE_${L}=	${WRKSRC}/LICENSE.${L}
 .endfor
 
 LIB_DEPENDS=	libevent.so:devel/libevent \
 		libqdbm.so:databases/qdbm \
 		libestraier.so:textproc/hyperestraier
 RUN_DEPENDS=	mew${EMACS_PKGNAMESUFFIX}>0:mail/mew@${EMACS_FLAVOR}
 
 USES=		emacs:run fakeroot iconv
 USE_GITHUB=	yes
 GH_ACCOUNT=	yasuoka
 
+MAKE_ARGS=	MANDIR=${PREFIX}/share/man/man
 MAKE_ENV=	USE_BSDMAKE=true WITH_INSTALL_AS_USER=true
 
 # XXX Static libraries with PIE are currently unsupported
 MAKE_ENV+=	WITHOUT_PIE=true
 
 LICENSE_BSD2CLAUSE_SRC=	bytebuf.c replace/sys/tree.h
 LICENSE_BSD3CLAUSE_SRC=	replace/sys/queue.h
 LICENSE_ISCL_SRC=	mailestctl.c parser.c parser.h \
 			replace/open_memstream.c \
 			replace/reallocarray.c \
 			replace/replace.h \
 			replace/strlcat.c \
 			replace/strtonum.c
 LICENSE_LGPL21_SRC=	estdraft.c
 LICENSE_BSD2CLAUSE_REGEX="/ \* [Cc]opyright/,/ \*\//!d;s,^ \*,,;s,^/,,"
 LICENSE_BSD3CLAUSE_REGEX=${LICENSE_BSD2CLAUSE_REGEX}
 LICENSE_ISCL_REGEX=	${LICENSE_BSD2CLAUSE_REGEX}
 LICENSE_LGPL21_REGEX=	"/^\/\*\*/,/\*\*\//!d;s,^ \*,,;s,^/,,"
 
 post-extract:
 .for L in ${LICENSE}
 .for F in ${LICENSE_${L}_SRC}
 	cd ${WRKSRC} && ${SED} -e ${LICENSE_${L}_REGEX} ${F} \
 	    >> ${LICENSE_FILE_${L}}
 .endfor
 .endfor
 
 .include <bsd.port.mk>
diff --git a/mail/mailest/pkg-plist b/mail/mailest/pkg-plist
index 3a5dbbaed99e..c7ef20c7a86b 100644
--- a/mail/mailest/pkg-plist
+++ b/mail/mailest/pkg-plist
@@ -1,11 +1,11 @@
 sbin/cmew-mailest
 sbin/mailestctl
 sbin/mew-mailest
 sbin/smew-mailest
 sbin/mailestd
-man/man1/cmew-mailest.1.gz
-man/man1/mailestctl.1.gz
-man/man1/mew-mailest.1.gz
-man/man1/smew-mailest.1.gz
-man/man5/mailestd.conf.5.gz
-man/man8/mailestd.8.gz
+share/man/man1/cmew-mailest.1.gz
+share/man/man1/mailestctl.1.gz
+share/man/man1/mew-mailest.1.gz
+share/man/man1/smew-mailest.1.gz
+share/man/man5/mailestd.conf.5.gz
+share/man/man8/mailestd.8.gz