diff --git a/mail/opensmtpd-extras-table-passwd/Makefile b/mail/opensmtpd-extras-table-passwd/Makefile
index bd50c64ae8e12..093575e9a29fe 100644
--- a/mail/opensmtpd-extras-table-passwd/Makefile
+++ b/mail/opensmtpd-extras-table-passwd/Makefile
@@ -1,10 +1,10 @@
 PKGNAMESUFFIX=	-table-passwd
-PORTREVISION=	0
+PORTREVISION=	1
 
 COMMENT=	passwd(5) table support for OpenSMTPD
 
 PLIST_FILES=	libexec/opensmtpd/table-passwd \
-		man/man5/table-passwd.5.gz
+		share/man/man5/table-passwd.5.gz
 
 CONFIGURE_ARGS+=	--with-table-passwd
 
diff --git a/mail/opensmtpd-extras-table-redis/Makefile b/mail/opensmtpd-extras-table-redis/Makefile
index 94cab3a33c87b..6e84e7cb45084 100644
--- a/mail/opensmtpd-extras-table-redis/Makefile
+++ b/mail/opensmtpd-extras-table-redis/Makefile
@@ -1,12 +1,12 @@
 PKGNAMESUFFIX=	-table-redis
-PORTREVISION=	0
+PORTREVISION=	1
 
 COMMENT=	Redis table support for OpenSMTPD
 
 LIB_DEPENDS=	libhiredis.so:databases/hiredis
 
 PLIST_FILES=	libexec/opensmtpd/table-redis \
-			man/man5/table-redis.5.gz
+			share/man/man5/table-redis.5.gz
 
 CONFIGURE_ARGS+=	--with-table-redis
 CONFIGURE_ENV=	REDIS_CONFIG=${LOCALBASE}/bin/pkgconf
diff --git a/mail/opensmtpd-extras-table-socketmap/Makefile b/mail/opensmtpd-extras-table-socketmap/Makefile
index 5da6c86110777..518c005535d1c 100644
--- a/mail/opensmtpd-extras-table-socketmap/Makefile
+++ b/mail/opensmtpd-extras-table-socketmap/Makefile
@@ -1,10 +1,10 @@
 PKGNAMESUFFIX=	-table-socketmap
-PORTREVISION=	0
+PORTREVISION=	1
 
 COMMENT=	Socketmap table support for OpenSMTPD
 
 PLIST_FILES=	libexec/opensmtpd/table-socketmap \
-		man/man5/table-socketmap.5.gz
+		share/man/man5/table-socketmap.5.gz
 
 CONFIGURE_ARGS+=	--with-table-socketmap
 
diff --git a/mail/opensmtpd-extras-table-sqlite/Makefile b/mail/opensmtpd-extras-table-sqlite/Makefile
index 49ba55284b6ca..6f01ad7614512 100644
--- a/mail/opensmtpd-extras-table-sqlite/Makefile
+++ b/mail/opensmtpd-extras-table-sqlite/Makefile
@@ -1,10 +1,10 @@
 PKGNAMESUFFIX=	-table-sqlite
-PORTREVISION=	0
+PORTREVISION=	1
 
 COMMENT=	SQLite table support for OpenSMTPD
 
 PLIST_FILES=	libexec/opensmtpd/table-sqlite \
-		man/man5/table-sqlite.5.gz
+		share/man/man5/table-sqlite.5.gz
 
 CONFIGURE_ARGS+=	--with-table-sqlite
 
diff --git a/mail/opensmtpd-extras/Makefile b/mail/opensmtpd-extras/Makefile
index 883b16e58566c..68fea85ab6674 100644
--- a/mail/opensmtpd-extras/Makefile
+++ b/mail/opensmtpd-extras/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	opensmtpd-extras
 PORTVERSION?=	6.7.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 PORTEPOCH?=	1
 CATEGORIES+=	mail
 MASTER_SITES=	http://www.opensmtpd.org/archives/
@@ -18,6 +18,7 @@ LIB_DEPENDS+=	libevent.so:devel/libevent
 
 USES+=		autoreconf ssl libtool
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 LDFLAGS+=	-L${OPENSSLLIB}
 CFLAGS+=	-I${OPENSSLINC}