diff --git a/mail/avenger/Makefile b/mail/avenger/Makefile
index 2a00e3d27f0f..e32ee72cdf57 100644
--- a/mail/avenger/Makefile
+++ b/mail/avenger/Makefile
@@ -1,60 +1,62 @@
 PORTNAME=	avenger
 PORTVERSION=	0.8.5
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailavenger.org/dist/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Anti-spam SMTP server
 WWW=		https://www.mailavenger.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		bdb ssl
 USE_CXXSTD=	c++14
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--enable-ssl=${OPENSSLBASE} \
 		--with-db=${LOCALBASE} \
 		--with-etcdir=${ETCDIR}
 CONFIGURE_ENV=	WFLAGS='-Wall'
 
 # Fix build with clang11
 CFLAGS+=	-fcommon
 
 CONFLICTS_INSTALL=	mailutils # bin/dotlock
 
 SUB_FILES=	pkg-message
 
 USERS=		${PORTNAME}
 GROUPS=		${USERS}
 
 PORTDOCS=	INSTALL INSTALL.html README NEWS
 
 OPTIONS_DEFINE=	DOCS SASL
 
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 SASL_CONFIGURE_ENABLE=	sasl
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/for vers in/s|5.*;|${BDB_LIB_NAME:S,db-,,};|' \
 		${WRKSRC}/configure
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/etc/asmtpd.conf \
 		${STAGEDIR}${ETCDIR}/asmtpd.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/etc/unknown \
 		${STAGEDIR}${ETCDIR}/unknown.sample
 	${INSTALL_DATA} ${WRKSRC}/etc/pf.os ${STAGEDIR}${PREFIX}/share
 
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/etc ; ${INSTALL_DATA} smtp-filter.pf avsendmail.m4 \
 		${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/mail/avenger/pkg-plist b/mail/avenger/pkg-plist
index db560c60722b..b6d291268a3d 100644
--- a/mail/avenger/pkg-plist
+++ b/mail/avenger/pkg-plist
@@ -1,35 +1,35 @@
 bin/aliascheck
 bin/dbutil
 bin/deliver
 bin/dotlock
 bin/edinplace
 bin/escape
 bin/macutil
 bin/mailexec
 bin/match
 bin/sendmac
 bin/smtpdcheck
 bin/synos
 @sample %%ETCDIR%%/asmtpd.conf.sample
 @sample %%ETCDIR%%/unknown.sample
 libexec/avenger
 libexec/avenger.local
-man/man1/aliascheck.1.gz
-man/man1/avenger.1.gz
-man/man1/dbutil.1.gz
-man/man1/deliver.1.gz
-man/man1/dotlock.1.gz
-man/man1/edinplace.1.gz
-man/man1/escape.1.gz
-man/man1/macutil.1.gz
-man/man1/mailexec.1.gz
-man/man1/match.1.gz
-man/man1/smtpdcheck.1.gz
-man/man1/synos.1.gz
-man/man5/asmtpd.conf.5.gz
-man/man8/asmtpd.8.gz
-man/man8/avenger.local.8.gz
+share/man/man1/aliascheck.1.gz
+share/man/man1/avenger.1.gz
+share/man/man1/dbutil.1.gz
+share/man/man1/deliver.1.gz
+share/man/man1/dotlock.1.gz
+share/man/man1/edinplace.1.gz
+share/man/man1/escape.1.gz
+share/man/man1/macutil.1.gz
+share/man/man1/mailexec.1.gz
+share/man/man1/match.1.gz
+share/man/man1/smtpdcheck.1.gz
+share/man/man1/synos.1.gz
+share/man/man5/asmtpd.conf.5.gz
+share/man/man8/asmtpd.8.gz
+share/man/man8/avenger.local.8.gz
 sbin/asmtpd
 %%DATADIR%%/avsendmail.m4
 %%DATADIR%%/smtp-filter.pf
 share/pf.os