diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index af0ed6035e79..404380fdc3ec 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	elm
 PORTVERSION=	2.5.8
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	mail
 MASTER_SITES=	http://instinct.org/elm/files/tarballs/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Once-popular mail user agent, version 2.5.x
 WWW=		https://instinct.org/elm/
 
 LICENSE=	ELM
 LICENSE_NAME=	Elm(tm) Mail System General Public License
 LICENSE_FILE=	${WRKSRC}/NOTICE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	ispell:textproc/aspell-ispell
 
 CFLAGS+=	-D_SIZE_T
 
 CONFLICTS_INSTALL=	hs-elm mailutils # bin/elm bin/frm
 
 WRKSRC=			${WRKDIR}/elm${PORTVERSION}
 USES=		gettext ncurses
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ENV=		PREFIX="${PREFIX}"
 CONFIGURE_ARGS=		-d
 MAKE_ARGS+=		CATMAN=catman-none
 MAKE_ARGS+=		DESTBIN="${STAGEDIR}${PREFIX}/bin"
 MAKE_ARGS+=		DESTLIB="${STAGEDIR}${PREFIX}/lib"
 MAKE_ARGS+=		LIB="${STAGEDIR}${PREFIX}/lib"
-MAKE_ARGS+=		MAN="${STAGEDIR}${PREFIX}/man/man1"
+MAKE_ARGS+=		MAN="${STAGEDIR}${PREFIX}/share/man/man1"
 MAKE_ARGS+=	-B
 EXTRACT_AFTER_ARGS=	--exclude gencat
 
 .include <bsd.port.mk>
diff --git a/mail/elm/pkg-plist b/mail/elm/pkg-plist
index c18c0b098d1b..8adb1c787fba 100644
--- a/mail/elm/pkg-plist
+++ b/mail/elm/pkg-plist
@@ -1,41 +1,41 @@
 bin/elm
 bin/answer
 bin/checkalias
 bin/elmalias
 bin/fastmail
 bin/frm
 bin/listalias
 bin/messages
 bin/newalias
 bin/newmail
 bin/nfrm
 bin/printmail
 bin/readmsg
 bin/prlong
 bin/mmencode
 bin/wnewmail
 lib/elmrc-info
 lib/help-main
 lib/help-options
 lib/help-alias
 lib/help-pager
 lib/help-status
 lib/help-fbrowser
 lib/help-attach
 lib/help-selfolder
 lib/mime-types
 lib/mlists.eg
-man/man1/elm.1.gz
-man/man1/elmalias.1.gz
-man/man1/fastmail.1.gz
-man/man1/frm.1.gz
-man/man1/listalias.1.gz
-man/man1/messages.1.gz
-man/man1/newalias.1.gz
-man/man1/printmail.1.gz
-man/man1/wnewmail.1.gz
-man/man1/newmail.1.gz
-man/man1/answer.1.gz
-man/man1/checkalias.1.gz
-man/man1/mmencode.1.gz
-man/man1/readmsg.1.gz
+share/man/man1/elm.1.gz
+share/man/man1/elmalias.1.gz
+share/man/man1/fastmail.1.gz
+share/man/man1/frm.1.gz
+share/man/man1/listalias.1.gz
+share/man/man1/messages.1.gz
+share/man/man1/newalias.1.gz
+share/man/man1/printmail.1.gz
+share/man/man1/wnewmail.1.gz
+share/man/man1/newmail.1.gz
+share/man/man1/answer.1.gz
+share/man/man1/checkalias.1.gz
+share/man/man1/mmencode.1.gz
+share/man/man1/readmsg.1.gz