diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 000d0f8fc95a..ba4c1ac95b76 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,135 +1,136 @@
 PORTNAME=	courier-imap
 PORTVERSION=	5.2.6
 PORTEPOCH=	2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	SF/courier/imap/${PORTVERSION}
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	IMAP (and POP3) server that provides access to Maildir mailboxes
 WWW=		https://www.courier-mta.org/imap/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool
 LIB_DEPENDS=	libcourier-unicode.so:devel/courier-unicode \
 		libcourierauth.so:security/courier-authlib-base \
 		libidn2.so:dns/libidn2 \
 		libpcre2-8.so:devel/pcre2
 
 USES=		compiler:c++11-lang gmake localbase:ldflags perl5 pkgconfig ssl \
 		tar:bzip2
 USE_RC_SUBR=	courier-imap-imapd courier-imap-imapd-ssl \
 		courier-imap-pop3d courier-imap-pop3d-ssl
 
 CONFLICTS=	courier imap-uw panda-imap
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ENV=	REHASH=${SCRIPTDIR}/c_rehash
 
 MAKE_ENV:=	${CONFIGURE_ENV}
 ALL_TARGET=	all makeimapaccess makedat
 
 SUB_FILES=	pkg-message
 SUB_LIST=	CONFDIR=${CONFDIR}
 
 #
 # options available:
 #
 # WITH_SYSLOG_FACILITY:         The syslogfacility to use
 #
 
 OPTIONS_DEFINE=	GDBM GNUTLS INOTIFY IPV6 TRASHQUOTA
 
 GNUTLS_DESC=	Use GnuTLS instead of OpenSSL (Enables SNI)
 INOTIFY_DESC=	Inotify support for IDLE command
 TRASHQUOTA_DESC=	Include deleted mails in the quota
 
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.opt)
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.opt"
 .endif
 
 CONFDIR?=	${PREFIX}/etc/${PORTNAME}
 USERDB?=	${PREFIX}/etc/userdb
 LIBEXECDIR?=	${PREFIX}/libexec/${PORTNAME}
 PLIST_SUB=	CONFDIR=${CONFDIR:S,^${PREFIX}/,,} \
 		LIBEXECDIR=${LIBEXECDIR:S,^${PREFIX}/,,}
 
 CONFIGURE_ARGS=	--sysconfdir=${CONFDIR} \
 		--localstatedir="${PREFIX}/var" \
 		--datadir=${DATADIR} \
 		--libexecdir=${LIBEXECDIR} \
 		--enable-workarounds-for-imap-client-bugs \
 		--enable-unicode \
 		--disable-root-check \
 		--with-locking-method=fcntl \
 		--with-notice=unicode
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
 			libgcrypt.so:security/libgcrypt
 GNUTLS_CONFIGURE_WITH=	gnutls
 GNUTLS_USES=		pkgconfig
 
 INOTIFY_LIB_DEPENDS=	libinotify.so:devel/libinotify
 
 IPV6_CONFIGURE_OFF=	--without-ipv6
 
 TRASHQUOTA_CONFIGURE_ON=--with-trashquota
 
 .include <bsd.port.pre.mk>
 
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep)
 .include "${.CURDIR}/../../security/courier-authlib/Makefile.dep"
 .endif
 
 .if ${PORT_OPTIONS:MSYSLOG_FACILITY}
 CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY}
 .endif
 
 .if ${PORT_OPTIONS:MAUTH_USERDB}
 .if ${PORT_OPTIONS:MGDBM}
 CONFIGURE_ARGS+=--with-db=gdbm --with-userdb=${USERDB}
 LIB_DEPENDS+=	libgdbm.so:databases/gdbm
 .else
 CONFIGURE_ARGS+=--with-db=db  --with-userdb=${USERDB}
 .endif
 .endif
 
 EXTRA_DOCS=	AUTHORS INSTALL NEWS \
 		libs/imap/ChangeLog \
 		libs/imap/README.proxy \
 		libs/maildir/README.imapkeywords.html \
 		libs/maildir/README.maildirfilter.html \
 		libs/maildir/README.maildirquota.txt \
 		libs/maildir/README.sharedfolders.txt \
 		libs/tcpd/README.couriertls \
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \
 		${WRKSRC}/libs/liblock/configure
 	@${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \
 		-e 's|@LN_S@|${RLN}|' \
 		${WRKSRC}/Makefile.in
 
 post-patch-INOTIFY-on:
 	@${REINPLACE_CMD} -e 's|LIBS = @LIBS@|& ${LOCALBASE}/lib/libinotify.a /usr/lib/libpthread.a|' \
 		${WRKSRC}/libs/maildir/Makefile.in \
 		${WRKSRC}/libs/imap/Makefile.in
 
 post-configure-INOTIFY-on:
 	@${ECHO_CMD} '#define HAVE_INOTIFY_INIT 1' >>${WRKSRC}/libs/maildir/config.h
 	@${ECHO_CMD} '#define HAVE_INOTIFY_INIT1 1' >>${WRKSRC}/libs/maildir/config.h
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/makeimapaccess ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_SCRIPT} ${WRKSRC}/makedat ${STAGEDIR}${PREFIX}/bin/
 .for i in imapd pop3d
 	${INSTALL_DATA} ${WRKSRC}/libs/imap/${i}.cnf ${STAGEDIR}${CONFDIR}/${i}.cnf.dist
 .endfor
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for a in ${EXTRA_DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${a} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/mail/courier-imap/pkg-plist b/mail/courier-imap/pkg-plist
index 2913b0db1c4f..9d83bdb28449 100644
--- a/mail/courier-imap/pkg-plist
+++ b/mail/courier-imap/pkg-plist
@@ -1,66 +1,66 @@
 bin/couriertls
 bin/deliverquota
 bin/imapd
 bin/maildiracl
 bin/maildirkw
 bin/maildirmake
 bin/makedat
 bin/makeimapaccess
 bin/pop3d
 @preunexec if cmp -s %D/%%CONFDIR%%/imapd-ssl.dist %D/%%CONFDIR%%/imapd-ssl; then rm -f %D/%%CONFDIR%%/imapd-ssl; fi
 %%CONFDIR%%/imapd-ssl.dist
 @postexec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/imapd-ssl.dist
 @preunexec if cmp -s %D/%%CONFDIR%%/imapd.cnf.dist %D/%%CONFDIR%%/imapd.cnf; then rm -f %D/%%CONFDIR%%/imapd.cnf; fi
 %%CONFDIR%%/imapd.cnf.dist
 @preunexec if cmp -s %D/%%CONFDIR%%/imapd.dist %D/%%CONFDIR%%/imapd; then rm -f %D/%%CONFDIR%%/imapd; fi
 %%CONFDIR%%/imapd.dist
 @postexec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/imapd.dist
 @preunexec if cmp -s %D/%%CONFDIR%%/pop3d-ssl.dist %D/%%CONFDIR%%/pop3d-ssl; then rm -f %D/%%CONFDIR%%/pop3d-ssl; fi
 %%CONFDIR%%/pop3d-ssl.dist
 @postexec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/pop3d-ssl.dist
 @preunexec if cmp -s %D/%%CONFDIR%%/pop3d.cnf.dist %D/%%CONFDIR%%/pop3d.cnf; then rm -f %D/%%CONFDIR%%/pop3d.cnf; fi
 %%CONFDIR%%/pop3d.cnf.dist
 @preunexec if cmp -s %D/%%CONFDIR%%/pop3d.dist %D/%%CONFDIR%%/pop3d; then rm -f %D/%%CONFDIR%%/pop3d; fi
 %%CONFDIR%%/pop3d.dist
 @postexec %%LOCALBASE%%/share/sysconftool/sysconftool %D/%%CONFDIR%%/pop3d.dist
 %%CONFDIR%%/quotawarnmsg.example
 %%LIBEXECDIR%%/couriertcpd
 %%LIBEXECDIR%%/imapd-ssl.rc
 %%LIBEXECDIR%%/imapd.rc
 %%LIBEXECDIR%%/makedatprog
 %%LIBEXECDIR%%/pop3d-ssl.rc
 %%LIBEXECDIR%%/pop3d.rc
-man/man1/couriertcpd.1.gz
-man/man1/maildiracl.1.gz
-man/man1/maildirkw.1.gz
-man/man1/maildirmake.1.gz
-man/man8/deliverquota.8.gz
-man/man8/imapd.8.gz
-man/man8/mkdhparams.8.gz
-man/man8/mkimapdcert.8.gz
-man/man8/makeimapaccess.8.gz
-man/man8/mkpop3dcert.8.gz
+share/man/man1/couriertcpd.1.gz
+share/man/man1/maildiracl.1.gz
+share/man/man1/maildirkw.1.gz
+share/man/man1/maildirmake.1.gz
+share/man/man8/deliverquota.8.gz
+share/man/man8/imapd.8.gz
+share/man/man8/mkdhparams.8.gz
+share/man/man8/mkimapdcert.8.gz
+share/man/man8/makeimapaccess.8.gz
+share/man/man8/mkpop3dcert.8.gz
 sbin/imaplogin
 sbin/mkdhparams
 sbin/mkimapdcert
 sbin/mkpop3dcert
 sbin/pop3login
 sbin/sharedindexinstall
 sbin/sharedindexsplit
 share/courier-imap/mkdhparams
 share/courier-imap/mkimapdcert
 share/courier-imap/mkpop3dcert
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README.proxy
 %%PORTDOCS%%%%DOCSDIR%%/README.imapkeywords.html
 %%PORTDOCS%%%%DOCSDIR%%/README.maildirfilter.html
 %%PORTDOCS%%%%DOCSDIR%%/README.maildirquota.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.couriertls
 @dir %%ETCDIR%%/imapaccess
 @dir var
 @dir %%CONFDIR%%/shared
 @dir %%CONFDIR%%/shared.tmp