diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 49d9a5334cae..c2a4cf9b3a5c 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -150,9 +150,6 @@ PKGNAMESUFFIX=	-current-base
 .endif
 PREFIX=		/usr
 ETCDIR=		/etc/postfix
-PLIST_SUB+=	BMAN="share/"
-.else
-PLIST_SUB+=	BMAN=""
 .endif
 
 PLIST_SUB+=	PFETC=${ETCDIR}
diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist
index cb64cc999ba7..0bc26f8b07fb 100644
--- a/mail/postfix-current/pkg-plist
+++ b/mail/postfix-current/pkg-plist
@@ -85,83 +85,83 @@ libexec/postfix/tlsproxy
 libexec/postfix/trivial-rewrite
 libexec/postfix/verify
 libexec/postfix/virtual
-%%BMAN%%share/man/man1/mailq.1.gz
-%%BMAN%%share/man/man1/newaliases.1.gz
-%%BMAN%%share/man/man1/postalias.1.gz
-%%BMAN%%share/man/man1/postcat.1.gz
-%%BMAN%%share/man/man1/postconf.1.gz
-%%BMAN%%share/man/man1/postdrop.1.gz
-%%BMAN%%share/man/man1/postfix-tls.1.gz
-%%BMAN%%share/man/man1/postfix.1.gz
-%%BMAN%%share/man/man1/postkick.1.gz
-%%BMAN%%share/man/man1/postlock.1.gz
-%%BMAN%%share/man/man1/postlog.1.gz
-%%BMAN%%share/man/man1/postmap.1.gz
-%%BMAN%%share/man/man1/postmulti.1.gz
-%%BMAN%%share/man/man1/postqueue.1.gz
-%%BMAN%%share/man/man1/postsuper.1.gz
-%%BMAN%%share/man/man1/posttls-finger.1.gz
-%%TEST%%%%BMAN%%share/man/man1/qmqp-sink.1.gz
-%%TEST%%%%BMAN%%share/man/man1/qmqp-source.1.gz
-%%BMAN%%share/man/man1/qshape.1.gz
-%%BMAN%%share/man/man1/sendmail.1.gz
-%%TEST%%%%BMAN%%share/man/man1/smtp-sink.1.gz
-%%TEST%%%%BMAN%%share/man/man1/smtp-source.1.gz
-%%BMAN%%share/man/man5/access.5.gz
-%%BMAN%%share/man/man5/aliases.5.gz
-%%BMAN%%share/man/man5/body_checks.5.gz
-%%BMAN%%share/man/man5/bounce.5.gz
-%%BMAN%%share/man/man5/canonical.5.gz
-%%BMAN%%share/man/man5/cidr_table.5.gz
-%%BMAN%%share/man/man5/generic.5.gz
-%%BMAN%%share/man/man5/header_checks.5.gz
-%%BMAN%%share/man/man5/ldap_table.5.gz
-%%BMAN%%share/man/man5/lmdb_table.5.gz
-%%BMAN%%share/man/man5/master.5.gz
-%%BMAN%%share/man/man5/memcache_table.5.gz
-%%BMAN%%share/man/man5/mysql_table.5.gz
-%%BMAN%%share/man/man5/nisplus_table.5.gz
-%%BMAN%%share/man/man5/pcre_table.5.gz
-%%BMAN%%share/man/man5/pgsql_table.5.gz
-%%BMAN%%share/man/man5/postconf.5.gz
-%%BMAN%%share/man/man5/postfix-wrapper.5.gz
-%%BMAN%%share/man/man5/regexp_table.5.gz
-%%BMAN%%share/man/man5/relocated.5.gz
-%%BMAN%%share/man/man5/socketmap_table.5.gz
-%%BMAN%%share/man/man5/sqlite_table.5.gz
-%%BMAN%%share/man/man5/tcp_table.5.gz
-%%BMAN%%share/man/man5/transport.5.gz
-%%BMAN%%share/man/man5/virtual.5.gz
-%%BMAN%%share/man/man8/anvil.8.gz
-%%BMAN%%share/man/man8/bounce.8.gz
-%%BMAN%%share/man/man8/cleanup.8.gz
-%%BMAN%%share/man/man8/defer.8.gz
-%%BMAN%%share/man/man8/discard.8.gz
-%%BMAN%%share/man/man8/dnsblog.8.gz
-%%BMAN%%share/man/man8/error.8.gz
-%%BMAN%%share/man/man8/flush.8.gz
-%%BMAN%%share/man/man8/lmtp.8.gz
-%%BMAN%%share/man/man8/local.8.gz
-%%BMAN%%share/man/man8/master.8.gz
-%%BMAN%%share/man/man8/oqmgr.8.gz
-%%BMAN%%share/man/man8/pickup.8.gz
-%%BMAN%%share/man/man8/pipe.8.gz
-%%BMAN%%share/man/man8/postlogd.8.gz
-%%BMAN%%share/man/man8/postscreen.8.gz
-%%BMAN%%share/man/man8/proxymap.8.gz
-%%BMAN%%share/man/man8/qmgr.8.gz
-%%BMAN%%share/man/man8/qmqpd.8.gz
-%%BMAN%%share/man/man8/scache.8.gz
-%%BMAN%%share/man/man8/showq.8.gz
-%%BMAN%%share/man/man8/smtp.8.gz
-%%BMAN%%share/man/man8/smtpd.8.gz
-%%BMAN%%share/man/man8/spawn.8.gz
-%%BMAN%%share/man/man8/tlsmgr.8.gz
-%%BMAN%%share/man/man8/tlsproxy.8.gz
-%%BMAN%%share/man/man8/trace.8.gz
-%%BMAN%%share/man/man8/trivial-rewrite.8.gz
-%%BMAN%%share/man/man8/verify.8.gz
-%%BMAN%%share/man/man8/virtual.8.gz
+share/man/man1/mailq.1.gz
+share/man/man1/newaliases.1.gz
+share/man/man1/postalias.1.gz
+share/man/man1/postcat.1.gz
+share/man/man1/postconf.1.gz
+share/man/man1/postdrop.1.gz
+share/man/man1/postfix-tls.1.gz
+share/man/man1/postfix.1.gz
+share/man/man1/postkick.1.gz
+share/man/man1/postlock.1.gz
+share/man/man1/postlog.1.gz
+share/man/man1/postmap.1.gz
+share/man/man1/postmulti.1.gz
+share/man/man1/postqueue.1.gz
+share/man/man1/postsuper.1.gz
+share/man/man1/posttls-finger.1.gz
+%%TEST%%share/man/man1/qmqp-sink.1.gz
+%%TEST%%share/man/man1/qmqp-source.1.gz
+share/man/man1/qshape.1.gz
+share/man/man1/sendmail.1.gz
+%%TEST%%share/man/man1/smtp-sink.1.gz
+%%TEST%%share/man/man1/smtp-source.1.gz
+share/man/man5/access.5.gz
+share/man/man5/aliases.5.gz
+share/man/man5/body_checks.5.gz
+share/man/man5/bounce.5.gz
+share/man/man5/canonical.5.gz
+share/man/man5/cidr_table.5.gz
+share/man/man5/generic.5.gz
+share/man/man5/header_checks.5.gz
+share/man/man5/ldap_table.5.gz
+share/man/man5/lmdb_table.5.gz
+share/man/man5/master.5.gz
+share/man/man5/memcache_table.5.gz
+share/man/man5/mysql_table.5.gz
+share/man/man5/nisplus_table.5.gz
+share/man/man5/pcre_table.5.gz
+share/man/man5/pgsql_table.5.gz
+share/man/man5/postconf.5.gz
+share/man/man5/postfix-wrapper.5.gz
+share/man/man5/regexp_table.5.gz
+share/man/man5/relocated.5.gz
+share/man/man5/socketmap_table.5.gz
+share/man/man5/sqlite_table.5.gz
+share/man/man5/tcp_table.5.gz
+share/man/man5/transport.5.gz
+share/man/man5/virtual.5.gz
+share/man/man8/anvil.8.gz
+share/man/man8/bounce.8.gz
+share/man/man8/cleanup.8.gz
+share/man/man8/defer.8.gz
+share/man/man8/discard.8.gz
+share/man/man8/dnsblog.8.gz
+share/man/man8/error.8.gz
+share/man/man8/flush.8.gz
+share/man/man8/lmtp.8.gz
+share/man/man8/local.8.gz
+share/man/man8/master.8.gz
+share/man/man8/oqmgr.8.gz
+share/man/man8/pickup.8.gz
+share/man/man8/pipe.8.gz
+share/man/man8/postlogd.8.gz
+share/man/man8/postscreen.8.gz
+share/man/man8/proxymap.8.gz
+share/man/man8/qmgr.8.gz
+share/man/man8/qmqpd.8.gz
+share/man/man8/scache.8.gz
+share/man/man8/showq.8.gz
+share/man/man8/smtp.8.gz
+share/man/man8/smtpd.8.gz
+share/man/man8/spawn.8.gz
+share/man/man8/tlsmgr.8.gz
+share/man/man8/tlsproxy.8.gz
+share/man/man8/trace.8.gz
+share/man/man8/trivial-rewrite.8.gz
+share/man/man8/verify.8.gz
+share/man/man8/virtual.8.gz
 sbin/postalias
 sbin/postcat
 sbin/postconf