diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index 36346dc20b8d..d1d33060d8e0 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -1,69 +1,69 @@
 PORTNAME=	mailagent
 PORTVERSION=	3.1.106
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Sophisticated automatic mail-processing tool
 WWW=		https://github.com/rmanfredi/mailagent
 
 LICENSE=	ART10
 LICENSE_FILE=	${WRKSRC}/Artistic
 
 USES=		perl5 tar:bzip2
 USE_CSTD=	c99
 USE_GITHUB=	yes
 GH_ACCOUNT=	rmanfredi
 GH_TAGNAME=	9a14a15
 
 ORGFILE=	${PREFIX}/etc/mailagent.orgname
 
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=		-dres \
 			-Dperlpath='${PERL}' \
 			-Dcc='${CC}' \
 			-Dccflags='${CFLAGS} -Wno-unknown-warning-option -Wno-unknown-warning -Wno-format-nonliteral -Wno-deprecated-non-prototype' \
 			-Dd_flockonly='define' \
 			-Dutmp='/var/run/utmp' \
 			-Dorgname='${ORGFILE}' \
 			-Dprefix='${PREFIX}' \
-			-Dmansrc='${STAGEDIR}${PREFIX}/man/man1'
+			-Dmansrc='${STAGEDIR}${PREFIX}/share/man/man1'
 MAKE_JOBS_UNSAFE=	yes
 MAKE_ENV=	PATH=`dirname ${PERL}`:${PATH} INSTALL_PREFIX=${STAGEDIR}
 INSTALL_TARGET=	install install.man
 
 SUB_LIST+=	ORGFILE="${ORGFILE}"
 SUB_FILES=	pkg-message
 PLIST_SUB+=	ORGFILE="${ORGFILE}"
 
 pre-extract:
 	@if [ `${SH} -c umask` != 0022 ]; then \
 	  ${ECHO} "Please set umask to 022 before running make,"; \
 	  ${ECHO} "or mailagent will not build successfully."; \
 	  ${FALSE}; fi
 
 post-patch:
 	@(cd ${WRKSRC}; \
 	  ${REINPLACE_CMD} -i '' -e 's|exec perl -S|exec ${PERL} -S|' \
 	    agent/edusers.SH agent/magent.sh agent/maildist.SH \
 	    agent/mailhelp.SH agent/maillist.SH agent/mailpatch.SH \
 	    agent/package.SH agent/test/TEST agent/test/atail \
 	    bin/perload misc/getcost/getcost misc/mime/unmime \
 	    misc/news/newsgate)
 
 TEST_CMD=	'(cd ${WRKSRC}/agent/test; ${SETENV} ${MAKE_ENV} ${MAKE})'
 do-test:
 	@if [ `${ID} -u` = 0 ]; then \
 	  ${CHOWN} -R nobody ${WRKSRC}/agent/test; \
 	  su -m nobody -c ${TEST_CMD}; \
 	else \
 	  ${SH} -c ${TEST_CMD}; \
 	fi
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/misc
 	cd ${WRKSRC}/misc && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/misc
 	${MV} ${STAGEDIR}${PREFIX}/lib/mailagent/examples ${STAGEDIR}${EXAMPLESDIR}/agent
 
 .include <bsd.port.mk>
diff --git a/mail/mailagent/pkg-plist b/mail/mailagent/pkg-plist
index ab9fb8536618..b84d3c3b0c42 100644
--- a/mail/mailagent/pkg-plist
+++ b/mail/mailagent/pkg-plist
@@ -1,77 +1,77 @@
 bin/mailpatch
 bin/mailhelp
 bin/maillist
 bin/maildist
 bin/package
 bin/edusers
 bin/mailagent
 lib/mailagent/filter
 lib/mailagent/agenthelp
 lib/mailagent/commands
 lib/mailagent/distribs
 lib/mailagent/filter.sh
 lib/mailagent/mailagent.cf
 lib/mailagent/proglist
 lib/mailagent/chkagent.sh
 lib/mailagent/setup.cf
 lib/mailagent/compressors
 lib/mailagent/help/addauth
 lib/mailagent/help/approve
 lib/mailagent/help/delpower
 lib/mailagent/help/end
 lib/mailagent/help/getauth
 lib/mailagent/help/help
 lib/mailagent/help/newpower
 lib/mailagent/help/passwd
 lib/mailagent/help/password
 lib/mailagent/help/power
 lib/mailagent/help/release
 lib/mailagent/help/remauth
 lib/mailagent/help/set
 lib/mailagent/help/setauth
 lib/mailagent/help/user
-man/man1/edusers.1.gz
-man/man1/mailagent.1.gz
-man/man1/mailhelp.1.gz
-man/man1/package.1.gz
+share/man/man1/edusers.1.gz
+share/man/man1/mailagent.1.gz
+share/man/man1/mailhelp.1.gz
+share/man/man1/package.1.gz
 @touch %%ORGFILE%%
 @rmempty %%ORGFILE%%
 %%EXAMPLESDIR%%/agent/README
 %%EXAMPLESDIR%%/agent/daemon
 %%EXAMPLESDIR%%/agent/mailfolders
 %%EXAMPLESDIR%%/agent/mchk
 %%EXAMPLESDIR%%/agent/mhinc
 %%EXAMPLESDIR%%/agent/nocmds
 %%EXAMPLESDIR%%/agent/profile
 %%EXAMPLESDIR%%/agent/rules
 %%EXAMPLESDIR%%/agent/vacation
 %%EXAMPLESDIR%%/misc/README
 %%EXAMPLESDIR%%/misc/fakesend/README
 %%EXAMPLESDIR%%/misc/fakesend/fakesend.pl
 %%EXAMPLESDIR%%/misc/fakesend/freplcomps
 %%EXAMPLESDIR%%/misc/fakesend/mh_profile
 %%EXAMPLESDIR%%/misc/getcost/README
 %%EXAMPLESDIR%%/misc/getcost/getcost
 %%EXAMPLESDIR%%/misc/getcost/rules
 %%EXAMPLESDIR%%/misc/getcost/spamconfig
 %%EXAMPLESDIR%%/misc/mime/README
 %%EXAMPLESDIR%%/misc/mime/rules
 %%EXAMPLESDIR%%/misc/mime/unmime
 %%EXAMPLESDIR%%/misc/news/README
 %%EXAMPLESDIR%%/misc/news/ml.map
 %%EXAMPLESDIR%%/misc/news/newsgate
 %%EXAMPLESDIR%%/misc/news/rules
 %%EXAMPLESDIR%%/misc/pbounce/README
 %%EXAMPLESDIR%%/misc/pbounce/mailagent.cf
 %%EXAMPLESDIR%%/misc/pbounce/newcmd.cf
 %%EXAMPLESDIR%%/misc/pbounce/patbounce.pl
 %%EXAMPLESDIR%%/misc/pbounce/rules
 %%EXAMPLESDIR%%/misc/shell/README
 %%EXAMPLESDIR%%/misc/shell/server.cf
 %%EXAMPLESDIR%%/misc/shell/shell
 %%EXAMPLESDIR%%/misc/unkit/README
 %%EXAMPLESDIR%%/misc/unkit/kitok.msg
 %%EXAMPLESDIR%%/misc/unkit/mailagent.cf
 %%EXAMPLESDIR%%/misc/unkit/newcmd.cf
 %%EXAMPLESDIR%%/misc/unkit/rules
 %%EXAMPLESDIR%%/misc/unkit/unkit.pl