diff --git a/mail/panda-imap/Makefile b/mail/panda-imap/Makefile
index 497b7d4c6536..c166681a1960 100644
--- a/mail/panda-imap/Makefile
+++ b/mail/panda-imap/Makefile
@@ -1,96 +1,96 @@
 PORTNAME=	panda-imap
 PORTVERSION=	20130621
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	IMAP4rev1/POP2/POP3 mail servers forked from imap-uw
 WWW=		https://github.com/jonabbey/panda-imap
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libc-client.so.2010:mail/panda-cclient
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jonabbey
 GH_TAGNAME=	01eaaa96c85c5791d5cffdf20c360b329bc44d88
 
 CONFLICTS_INSTALL=	imap-uw # bin/dmail
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 SUB_FILES=	pkg-message
 
 MAKE_JOBS_UNSAFE=	yes
 
 ALL_TARGET=	bsf
 
 # This port must have the same SSL settings as mail/cclient, which it depends on
 # To make MBX format the default mailbox format, change the settings of cclient
 
 OPTIONS_DEFINE=	DOCS SSL SSL_AND_PLAINTEXT
 OPTIONS_DEFAULT=	SSL
 OPTIONS_SUB=	yes
 
 SSL_AND_PLAINTEXT_DESC=	Allow plain text passwords and SSL
 
 .include <bsd.port.options.mk>
 
 .if ! ${PORT_OPTIONS:MSSL}
 MAKE_ARGS+=	SSLTYPE=none SSLDIR=${OPENSSLBASE}
 .else
 USES+=		ssl
 .if ${PORT_OPTIONS:MSSL_AND_PLAINTEXT}
 MAKE_ARGS+=	SSLTYPE=unix
 .else
 MAKE_ARGS+=	SSLTYPE=unix.nopwd
 .endif
 .endif
 
 # See src/imapd/Makefile for more information about these two options.
 
 .include <bsd.port.pre.mk>
 post-patch:
 	@${REINPLACE_CMD} -e "s:/etc/c-client.cf:${PREFIX}/etc/c-client.cf:" \
 		${WRKSRC}/docs/imaprc.txt
 	@${RM} ${WRKSRC}/docs/imaprc.txt.bak
 
 pre-build:
 	@${SH} ${FILESDIR}/pkg-req.rev ${LOCALBASE}/include/c-client/portrevision.h ${PORTVERSION}
 .if ${PORT_OPTIONS:MSSL}
 	@${SH} ${FILESDIR}/pkg-req.ssl ${LOCALBASE}/include/c-client/portrevision.h yes
 .else
 	@${SH} ${FILESDIR}/pkg-req.ssl ${LOCALBASE}/include/c-client/portrevision.h no
 .endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/imapd/imapd ${STAGEDIR}${PREFIX}/libexec/
 	${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop2d ${STAGEDIR}${PREFIX}/libexec/
 	${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop3d ${STAGEDIR}${PREFIX}/libexec/
 	${INSTALL} ${COPY} ${STRIP}	\
 		${WRKSRC}/mlock/mlock ${STAGEDIR}${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${WRKSRC}/mtest/mtest ${STAGEDIR}${PREFIX}/bin/mboxtest
 	${INSTALL_MAN} \
-		${WRKSRC}/src/imapd/imapd.8 ${STAGEDIR}${PREFIX}/man/man8/imapd.8
+		${WRKSRC}/src/imapd/imapd.8 ${STAGEDIR}${PREFIX}/share/man/man8/imapd.8
 	${INSTALL_MAN} \
-		${WRKSRC}/src/ipopd/ipopd.8 ${STAGEDIR}${PREFIX}/man/man8/ipopd.8
+		${WRKSRC}/src/ipopd/ipopd.8 ${STAGEDIR}${PREFIX}/share/man/man8/ipopd.8
 	${INSTALL_PROGRAM} ${WRKSRC}/dmail/dmail ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/mailutil/mailutil ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_PROGRAM} ${WRKSRC}/tmail/tmail ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/src/dmail/dmail.1 ${STAGEDIR}${PREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKSRC}/src/mailutil/mailutil.1 ${STAGEDIR}${PREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKSRC}/src/tmail/tmail.1 ${STAGEDIR}${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/src/dmail/dmail.1 ${STAGEDIR}${PREFIX}/share/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/src/mailutil/mailutil.1 ${STAGEDIR}${PREFIX}/share/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/src/tmail/tmail.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 
 post-install-DOCS-on:
 	${MKDIR} -m 0755 -p ${STAGEDIR}${DOCSDIR}
 	${TAR} -C ${WRKSRC}/docs -cf - . | \
 		(umask 022; ${TAR} -C ${STAGEDIR}${DOCSDIR} -xf -)
 
 cert:
 	${INSTALL} -d -o root -g wheel -m 0755 ${PREFIX}/certs
 	openssl req -new -x509 -days 365 -nodes -config ${FILESDIR}/imap-uw.cnf -out ${PREFIX}/certs/imapd.pem -keyout ${PREFIX}/certs/imapd.pem
 	openssl x509 -subject -dates -fingerprint -noout -in ${PREFIX}/certs/imapd.pem
 	${CHMOD} 700 ${PREFIX}/certs/imapd.pem
 	${LN} -s ${PREFIX}/certs/imapd.pem ${PREFIX}/certs/ipop3d.pem
 
 .include <bsd.port.post.mk>
diff --git a/mail/panda-imap/pkg-plist b/mail/panda-imap/pkg-plist
index d2be7228b523..40887cf4fb3c 100644
--- a/mail/panda-imap/pkg-plist
+++ b/mail/panda-imap/pkg-plist
@@ -1,91 +1,91 @@
 bin/dmail
 bin/mailutil
 bin/mboxtest
 bin/tmail
 libexec/imapd
 libexec/ipop2d
 libexec/ipop3d
 @(,mail,2711) libexec/mlock
-man/man1/dmail.1.gz
-man/man1/mailutil.1.gz
-man/man1/tmail.1.gz
-man/man8/ipopd.8.gz
-man/man8/imapd.8.gz
+share/man/man1/dmail.1.gz
+share/man/man1/mailutil.1.gz
+share/man/man1/tmail.1.gz
+share/man/man8/ipopd.8.gz
+share/man/man8/imapd.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/BUILD
 %%PORTDOCS%%%%DOCSDIR%%/CONFIG
 %%PORTDOCS%%%%DOCSDIR%%/FAQ.html
 %%PORTDOCS%%%%DOCSDIR%%/FAQ.txt
 %%PORTDOCS%%%%DOCSDIR%%/IPv6.txt
 %%PORTDOCS%%%%DOCSDIR%%/RELNOTES
 %%PORTDOCS%%%%DOCSDIR%%/SSLBUILD
 %%PORTDOCS%%%%DOCSDIR%%/Y2K
 %%PORTDOCS%%%%DOCSDIR%%/bugs.txt
 %%PORTDOCS%%%%DOCSDIR%%/calendar.txt
 %%PORTDOCS%%%%DOCSDIR%%/commndmt.txt
 %%PORTDOCS%%%%DOCSDIR%%/drivers.txt
 %%PORTDOCS%%%%DOCSDIR%%/formats.txt
 %%PORTDOCS%%%%DOCSDIR%%/imaprc.txt
 %%PORTDOCS%%%%DOCSDIR%%/internal.txt
 %%PORTDOCS%%%%DOCSDIR%%/locking.txt
 %%PORTDOCS%%%%DOCSDIR%%/md5.txt
 %%PORTDOCS%%%%DOCSDIR%%/mixfmt.txt
 %%PORTDOCS%%%%DOCSDIR%%/naming.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/README
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1732.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1733.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2061.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2062.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2087.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2088.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2177.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2180.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2193.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2195.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2221.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2342.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2683.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2971.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3348.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3501.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3502.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3503.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3516.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3656.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3691.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4314.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4315.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4422.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4466.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4467.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4468.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4469.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4505.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4549.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4551.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4616.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4731.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4752.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4790.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4959.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4978.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5032.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5051.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5092.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5161.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5162.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5234.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5255.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5256.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5257.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5258.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5259.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5267.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5464.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5465.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5466.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5524.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5530.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5593.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5738.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5788.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5819.txt