diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile
index 73f7986358ac..5eec7658d96a 100644
--- a/mail/imapfilter/Makefile
+++ b/mail/imapfilter/Makefile
@@ -1,50 +1,51 @@
 PORTNAME=	imapfilter
 PORTVERSION=	2.8.2
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	mail
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	IMAP mail filtering utility
 WWW=		https://github.com/lefcha/imapfilter
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 
 USES=		cpe localbase:ldflags lua ssl
 CPE_VENDOR=	imapfilter_project
 USE_GITHUB=	yes
 GH_ACCOUNT=	lefcha
 
 MAKE_ARGS=	PREFIX=${PREFIX} \
 		MYCFLAGS="${CPPFLAGS}" \
 		MYLDFLAGS="${LDFLAGS}" \
 		BINDIR=${PREFIX}/bin \
 		SHAREDIR=${DATADIR} \
-		MANDIR=${MANPREFIX}/man \
+		MANDIR=${PREFIX}/share/man \
 		LIBLUA=-llua-${LUA_VER}
 
 CPPFLAGS+=	-I${LUA_INCDIR}
 
 PORTDOCS=	LICENSE NEWS README
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 OPTIONS_SUB=	yes
 
 post-patch:
 	@${REINPLACE_CMD} 's|-ldl ||' ${WRKSRC}/src/Makefile
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/imapfilter
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}/${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}/${DATADIR} ${STAGEDIR}/${EXAMPLESDIR}
 	cd ${WRKSRC}/samples && \
 		${INSTALL_DATA} config.lua extend.lua \
 			${STAGEDIR}/${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/imapfilter/pkg-plist b/mail/imapfilter/pkg-plist
index dea0699eca35..7fb422bd9139 100644
--- a/mail/imapfilter/pkg-plist
+++ b/mail/imapfilter/pkg-plist
@@ -1,13 +1,13 @@
 bin/imapfilter
-man/man1/imapfilter.1.gz
-man/man5/imapfilter_config.5.gz
+share/man/man1/imapfilter.1.gz
+share/man/man5/imapfilter_config.5.gz
 %%DATADIR%%/account.lua
 %%DATADIR%%/auxiliary.lua
 %%DATADIR%%/common.lua
 %%DATADIR%%/mailbox.lua
 %%DATADIR%%/message.lua
 %%DATADIR%%/options.lua
 %%DATADIR%%/regex.lua
 %%DATADIR%%/set.lua
 %%EXAMPLES%%%%EXAMPLESDIR%%/config.lua
 %%EXAMPLES%%%%EXAMPLESDIR%%/extend.lua