diff --git a/mail/postfix/Makefile.inc b/mail/postfix/Makefile.inc
index cc602741cb1..f32f6dd719e 100644
--- a/mail/postfix/Makefile.inc
+++ b/mail/postfix/Makefile.inc
@@ -1,11 +1,12 @@
-# $OpenBSD: Makefile.inc,v 1.14 2001/11/28 09:35:14 jakob Exp $
+# $OpenBSD: Makefile.inc,v 1.15 2002/01/25 08:14:29 jakob Exp $
 
 COMMENT=	fast, secure sendmail replacement
 
 CATEGORIES=	mail
 NEED_VERSION=	1.491
 
-MASTER_SITES=	ftp://ftp.merit.edu/postfix/%SUBDIR%/ \
+MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/%SUBDIR%/ \
+		ftp://ftp.merit.edu/postfix/%SUBDIR%/ \
 		ftp://ftp.sunet.se/pub/unix/mail/postfix/%SUBDIR%/ \
 		ftp://ftp.tau.ac.il/pub/unix/mail/postfix/%SUBDIR%/ \
 		ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/%SUBDIR%/
@@ -23,7 +24,7 @@ PERMIT_DISTFILES_CDROM=	yes
 PERMIT_DISTFILES_FTP=	yes
 
 MAKE_DEBUG?=
-MAKE_CCARGS?=
+MAKE_CCARGS?=	-DFD_SETSIZE=2048
 MAKE_AUXLIBS?=
 
 ALL_TARGET=	default
@@ -56,6 +57,8 @@ MAKE_AUXLIBS+=	-L${LOCALBASE}/lib/mysql -lmysqlclient
 .endif
 
 .if ${FLAVOR:L:Mtls}
+PKGNAME:=	${PKGNAME}.tls${TLSVERSION}
+
 MASTER_SITES0=	ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/ \
 		ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/old/
 
@@ -88,17 +91,24 @@ do-configure:
 		CCARGS="${MAKE_CCARGS}" AUXLIBS="${MAKE_AUXLIBS}"
 
 do-install:
-	${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/postfix
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/postfix
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/postfix
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/* ${PREFIX}/sbin
+	(cd ${WRKSRC}; sh postfix-install \
+		-non-interactive \
+		install_root=${WRKINST} \
+		daemon_directory=${TRUEPREFIX}/libexec/postfix \
+		command_directory=${TRUEPREFIX}/sbin \
+		sendmail_path=${TRUEPREFIX}/sbin/sendmail \
+		newalises_path=${TRUEPREFIX}/sbin/newaliases \
+		mailq_path=${TRUEPREFIX}/sbin/mailq \
+		mail_owner=postfix \
+		setgid_group=postdrop \
+		manpage_directory=${TRUEPREFIX}/man \
+		readme_directory=${TRUEPREFIX}/share/doc/postfix/readme \
+		)
 	${INSTALL_SCRIPT} ${FILESDIR}/postfix-enable ${PREFIX}/sbin
 	${INSTALL_SCRIPT} ${FILESDIR}/postfix-disable ${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/libexec/* ${PREFIX}/libexec/postfix
-	${INSTALL_DATA} ${WRKSRC}/conf/* ${PREFIX}/share/examples/postfix
-	@(cd ${WRKSRC}/man; \
-	  for mandir in man[0-9]; do \
-	     ${INSTALL_MAN} $$mandir/* ${PREFIX}/man/$$mandir; \
-	  done)
-	${INSTALL_DATA} ${WRKSRC}/html/*.html ${PREFIX}/share/doc/postfix
-	${INSTALL_DATA} ${WRKSRC}/html/*.gif ${PREFIX}/share/doc/postfix
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/postfix
+	mv ${WRKINST}/etc/postfix/* ${PREFIX}/share/examples/postfix
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/postfix/html
+	${INSTALL_DATA} ${WRKSRC}/html/*.html ${PREFIX}/share/doc/postfix/html
+	${INSTALL_DATA} ${WRKSRC}/html/*.gif ${PREFIX}/share/doc/postfix/html
+	rm -fr ${WRKINST}/var/spool/postfix
diff --git a/mail/postfix/stable/Makefile b/mail/postfix/stable/Makefile
index 8f41f404285..d41b9eddfa5 100644
--- a/mail/postfix/stable/Makefile
+++ b/mail/postfix/stable/Makefile
@@ -1,13 +1,15 @@
-# $OpenBSD: Makefile,v 1.24 2002/01/08 14:56:01 jakob Exp $
+# $OpenBSD: Makefile,v 1.25 2002/01/25 08:14:29 jakob Exp $
 
-DISTNAME=	postfix-20010228-pl08
-PKGNAME=	postfix-20010228.pl08
+VERSION=	1.1.1
+
+DISTNAME=	postfix-${VERSION}
+PKGNAME=	postfix-${VERSION}
 
 MAINTAINER=	Jakob Schlyter <jakob@openbsd.org>
 
 MASTER_SITE_SUBDIR=	official
 
-TLSVERSION=	0.7.14
-TLSDISTNAME=	pfixtls-${TLSVERSION}-20010228-pl08-0.9.6c
+TLSVERSION=	0.8.1
+TLSDISTNAME=	pfixtls-${TLSVERSION}-${VERSION}-0.9.6c
 
 .include <bsd.port.mk>
diff --git a/mail/postfix/stable/distinfo b/mail/postfix/stable/distinfo
index 87ae4bceb27..4e6f433f0a0 100644
--- a/mail/postfix/stable/distinfo
+++ b/mail/postfix/stable/distinfo
@@ -1,6 +1,6 @@
-MD5 (postfix/pfixtls-0.7.14-20010228-pl08-0.9.6c.tar.gz) = a5a1bd957105cfabcfb87cb2ed8008a1
-MD5 (postfix/postfix-20010228-pl08.tar.gz) = 3efd7d52e01acc014e7dabdd8081a369
-RMD160 (postfix/pfixtls-0.7.14-20010228-pl08-0.9.6c.tar.gz) = 6db8744a4e086ca11a5c95c9c40f8bca2616a64f
-RMD160 (postfix/postfix-20010228-pl08.tar.gz) = e87b9781ef924ca3ca536473dcbba1d3b0d839c9
-SHA1 (postfix/pfixtls-0.7.14-20010228-pl08-0.9.6c.tar.gz) = 5276741687f3d62684c97271c3f8ca75088e3b54
-SHA1 (postfix/postfix-20010228-pl08.tar.gz) = d171867ba89c3766f2346575acdab8423ebf7077
+MD5 (postfix/pfixtls-0.8.1-1.1.1-0.9.6c.tar.gz) = a445439c23876aa158453462be4d2485
+MD5 (postfix/postfix-1.1.1.tar.gz) = 92c744236920a03c5804663dbb2b2741
+RMD160 (postfix/pfixtls-0.8.1-1.1.1-0.9.6c.tar.gz) = fd972903dd9b552af7d8ba0b3ee2d0522ac79f1c
+RMD160 (postfix/postfix-1.1.1.tar.gz) = b251603e9c51333f2471a18ca290f0225f8cedd7
+SHA1 (postfix/pfixtls-0.8.1-1.1.1-0.9.6c.tar.gz) = dde06ec29a3cdfa914491ffba439008f3561ccd0
+SHA1 (postfix/postfix-1.1.1.tar.gz) = 43f17011b81f5101d47a654edd61080248083d4c
diff --git a/mail/postfix/stable/files/patch-tls-master.cf b/mail/postfix/stable/files/patch-tls-master.cf
index a2b65518fde..d3c53af14bb 100644
--- a/mail/postfix/stable/files/patch-tls-master.cf
+++ b/mail/postfix/stable/files/patch-tls-master.cf
@@ -1,11 +1,11 @@
---- conf/master.cf.orig	Thu Oct 25 22:20:55 2001
-+++ conf/master.cf	Thu Oct 25 22:24:19 2001
+--- conf/master.cf.orig	Thu Oct 25 22:22:08 2001
++++ conf/master.cf	Thu Oct 25 22:24:18 2001
 @@ -69,6 +69,8 @@
  # 		(yes)	(yes)	(yes)	(never)	(50)
  # ==========================================================================
  smtp	  inet	n	-	-	-	-	smtpd
 +#smtps     inet  n	-	-	-	-	smtpd -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes
 +#submission inet n	-	-	-	-	smtpd -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes
+ #628	  inet	n	-	-	-	-	qmqpd
  pickup	  fifo	n	n	-	60	1	pickup
  cleanup	  unix	-	-	-	-	0	cleanup
- qmgr	  fifo	n	-	-	300	1	qmgr
diff --git a/mail/postfix/stable/patches/patch-main.cf b/mail/postfix/stable/patches/patch-main.cf
deleted file mode 100644
index c7849ae9ef5..00000000000
--- a/mail/postfix/stable/patches/patch-main.cf
+++ /dev/null
@@ -1,46 +0,0 @@
---- conf/main.cf.orig	Mon Dec 27 22:03:38 1999
-+++ conf/main.cf	Sat Jan  1 20:51:22 2000
-@@ -17,14 +17,14 @@
- # The command_directory parameter specifies the location of all
- # postXXX commands.  The default value is $program_directory.
- #
--command_directory = /usr/sbin
-+command_directory = y0y0y0/sbin
- 
- # The daemon_directory parameter specifies the location of all Postfix
- # daemon programs (i.e. programs listed in the master.cf file). The
- # default value is $program_directory. This directory must be owned
- # by root.
- #
--daemon_directory = /usr/libexec/postfix
-+daemon_directory = y0y0y0/libexec/postfix
- 
- # QUEUE AND PROCESS OWNERSHIP
- #
-@@ -41,7 +41,7 @@
- # These rights are used in the absence of a recipient user context.
- # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
- #
--#default_privs = nobody
-+default_privs = nobody
- 
- # INTERNET HOST AND DOMAIN NAMES
- # 
-@@ -165,7 +165,7 @@
- # "postfix reload" to eliminate the delay.
- #
- #alias_maps = dbm:/etc/aliases
--#alias_maps = hash:/etc/aliases
-+alias_maps = hash:/etc/aliases
- #alias_maps = hash:/etc/aliases, nis:mail.aliases
- #alias_maps = netinfo:/aliases
- 
-@@ -176,7 +176,7 @@
- #
- #alias_database = dbm:/etc/aliases
- #alias_database = dbm:/etc/mail/aliases
--#alias_database = hash:/etc/aliases
-+alias_database = hash:/etc/aliases
- #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
- 
- # ADDRESS EXTENSIONS (e.g., user+foo)
diff --git a/mail/postfix/stable/patches/patch-makedefs b/mail/postfix/stable/patches/patch-makedefs
deleted file mode 100644
index 2f04bd68f68..00000000000
--- a/mail/postfix/stable/patches/patch-makedefs
+++ /dev/null
@@ -1,11 +0,0 @@
---- makedefs.orig	Tue Feb 20 01:18:32 2001
-+++ makedefs	Sat Sep 15 00:11:58 2001
-@@ -93,6 +93,8 @@
- 		;;
-   OpenBSD.2*)	SYSTYPE=OPENBSD2
- 		;;
-+  OpenBSD.3*)   SYSTYPE=OPENBSD3
-+		;;
-    NetBSD.1*)	SYSTYPE=NETBSD1
- 		;;
-    BSD/OS.2*)	SYSTYPE=BSDI2
diff --git a/mail/postfix/stable/patches/patch-master.cf b/mail/postfix/stable/patches/patch-master.cf
index 670c36fbdaf..d832f2522c3 100644
--- a/mail/postfix/stable/patches/patch-master.cf
+++ b/mail/postfix/stable/patches/patch-master.cf
@@ -1,30 +1,32 @@
---- conf/master.cf.orig	Sun Jan 28 21:54:01 2001
-+++ conf/master.cf	Thu Feb  1 08:22:24 2001
-@@ -67,21 +67,21 @@
+--- conf/master.cf.orig	Tue Jan  8 16:08:32 2002
++++ conf/master.cf	Tue Jan  8 16:18:38 2002
+@@ -68,22 +68,22 @@
  # service type	private	unpriv	chroot	wakeup	maxproc	command + args
  # 		(yes)	(yes)	(yes)	(never)	(50)
  # ==========================================================================
 -smtp	  inet	n	-	n	-	-	smtpd
--pickup	  fifo	n	n	n	60	1	pickup
--cleanup	  unix	-	-	n	-	0	cleanup
+-#628	  inet	n	-	n	-	-	qmqpd
+-pickup	  fifo	n	-	n	60	1	pickup
+-cleanup	  unix	n	-	n	-	0	cleanup
 -qmgr	  fifo	n	-	n	300	1	qmgr
 -#qmgr	  fifo	n	-	n	300	1	nqmgr
 -rewrite	  unix	-	-	n	-	-	trivial-rewrite
 -bounce	  unix	-	-	n	-	0	bounce
 -defer	  unix	-	-	n	-	0	bounce
--flush	  unix	-	-	n	1000?	0	flush
+-flush	  unix	n	-	n	1000?	0	flush
 -smtp	  unix	-	-	n	-	-	smtp
 -showq     unix	n	-	n	-	-	showq
 -error     unix	-	-	n	-	-	error
 +smtp	  inet	n	-	-	-	-	smtpd
-+pickup	  fifo	n	n	-	60	1	pickup
-+cleanup	  unix	-	-	-	-	0	cleanup
++#628	  inet	n	-	-	-	-	qmqpd
++pickup	  fifo	n	-	-	60	1	pickup
++cleanup	  unix	n	-	-	-	0	cleanup
 +qmgr	  fifo	n	-	-	300	1	qmgr
 +#qmgr	  fifo	n	-	-	300	1	nqmgr
 +rewrite	  unix	-	-	-	-	-	trivial-rewrite
 +bounce	  unix	-	-	-	-	0	bounce
 +defer	  unix	-	-	-	-	0	bounce
-+flush	  unix	-	-	-	1000?	0	flush
++flush	  unix	n	-	-	1000?	0	flush
 +smtp	  unix	-	-	-	-	-	smtp
 +showq     unix	n	-	-	-	-	showq
 +error     unix	-	-	-	-	-	error
@@ -32,6 +34,6 @@
  virtual	  unix	-	n	n	-	-	virtual
 -lmtp	  unix	-	-	n	-	-	lmtp
 +lmtp	  unix	-	-	-	-	-	lmtp
- cyrus	  unix	-	n	n	-	-	pipe
-     flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
- uucp	  unix	-	n	n	-	-	pipe
+ #
+ # Interfaces to non-Postfix software. Be sure to examine the manual
+ # pages of the non-Postfix software to find out what options it wants.
diff --git a/mail/postfix/stable/patches/patch-sys_defs.h b/mail/postfix/stable/patches/patch-sys_defs.h
deleted file mode 100644
index 858fe454dab..00000000000
--- a/mail/postfix/stable/patches/patch-sys_defs.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- sys_defs.h.orig	Sat Sep 15 00:38:11 2001
-+++ src/util/sys_defs.h	Sat Sep 15 00:40:13 2001
-@@ -26,7 +26,7 @@
- #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
-     || defined(FREEBSD5) \
-     || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
--    || defined(OPENBSD2) || defined(NETBSD1)
-+    || defined(OPENBSD2) || defined(OPENBSD3) || defined(NETBSD1)
- #define SUPPORTED
- #include <sys/types.h>
- #include <sys/param.h>
-@@ -58,7 +58,7 @@
- #define HAS_DUPLEX_PIPE
- #endif
- 
--#if defined(OPENBSD2) || defined(FREEBSD3) || defined(FREEBSD4)
-+#if defined(OPENBSD2) || defined(OPENBSD3) || defined(FREEBSD3) || defined(FREEBSD4)
- #define HAS_ISSETUGID
- #endif
- 
diff --git a/mail/postfix/stable/pkg/DEINSTALL b/mail/postfix/stable/pkg/DEINSTALL
index 9dade60c8e0..589919dbc37 100644
--- a/mail/postfix/stable/pkg/DEINSTALL
+++ b/mail/postfix/stable/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1 2000/09/25 21:02:35 jakob Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2002/01/25 08:14:30 jakob Exp $
 #
 # De-installation setup of postfix
 
@@ -22,10 +22,10 @@ do_accts()
 {
     echo ""
     echo "+---------------"
-    echo "| Delete the 'postfix' user account, and 'postfix' and 'maildrop'"
+    echo "| Delete the 'postfix' user account, and 'postfix' and 'postdrop'"
     echo "| group accounts manually for a full de-installation."
     echo "| To do this: execute 'user del postfix', 'group del postfix' and"
-    echo "| 'group del maildrop' as root."
+    echo "| 'group del postdrop' as root."
     echo "+---------------"
     echo ""
 }
@@ -49,7 +49,8 @@ do_configs()
 {
     echo ""
     echo "+---------------"
-    echo "| The existing $1 configuration files in $CONFIG_DIR,"
+    echo "| The existing $1 configuration files"
+    echo "| in $CONFIG_DIR,"
     echo "| have NOT been deleted. To do this: execute"
     echo "| 'rm -rf $CONFIG_DIR' as root."
     echo "+---------------"
diff --git a/mail/postfix/stable/pkg/INSTALL b/mail/postfix/stable/pkg/INSTALL
index 18e09cb1dbe..c5a998afd2b 100644
--- a/mail/postfix/stable/pkg/INSTALL
+++ b/mail/postfix/stable/pkg/INSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.1 2000/09/25 21:02:35 jakob Exp $
+# $OpenBSD: INSTALL,v 1.2 2002/01/25 08:14:30 jakob Exp $
 #
 # Pre/post-installation setup of postfix
 
@@ -13,12 +13,18 @@ SPOOL_DIR=/var/spool/postfix
 #
 do_accts()
 {
-    groupinfo -e maildrop
+    groupinfo -e postdrop
     if [ $? -eq 0 ]; then
-	echo "-> Using group 'maildrop' for postdrop"
+	echo "-> Using group 'postdrop' for postdrop"
     else
-	echo "-> Creating maildrop group"
-	groupadd maildrop
+        groupinfo -e maildrop
+        if [ $? -eq 0 ]; then
+	    echo "-> Renaming group 'maildrop' to 'postdrop'"
+	    groupmod -n postdrop maildrop
+        else
+	    echo "-> Creating postdrop group"
+	    groupadd postdrop
+        fi
     fi
 
     userinfo -e postfix
@@ -28,7 +34,7 @@ do_accts()
 	echo "-> Creating postfix user & group"
 	useradd \
 	    -g =uid \
-	    -c "Disgruntled Postal Worker" \
+	    -c "Postfix Daemon" \
 	    -d /nonexistent \
 	    -s /sbin/nologin \
 	    -p \* \
@@ -85,12 +91,9 @@ do_configs()
 	# Install config files.
 	install -d -o root -g wheel -m 755 $CONFIG_DIR
 	install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/* $CONFIG_DIR
-	sed "s@y0y0y0@$PREFIX@g" $CONFIG_DIR/main.cf > $CONFIG_DIR/main.cf.$$
-	install -o root -g wheel -m 644 $CONFIG_DIR/main.cf.$$ $CONFIG_DIR/main.cf
-	rm -f $CONFIG_DIR/main.cf.$$
 
-	# The correct postfix-script will be installed later.
-	rm -f $CONFIG_DIR/postfix-script*
+	# The correct files will be installed later.
+	rm -f $CONFIG_DIR/{postfix-script,postfix-files,post-install}
 
 	echo ""
 	echo "+---------------"
@@ -101,10 +104,12 @@ do_configs()
 	echo ""
     fi
 
-    # Configure setgid maildrop
-    install -o root -g wheel -m 755 $SAMPLE_CONFIG_DIR/postfix-script-sgid $CONFIG_DIR/postfix-script
-    chgrp maildrop $PREFIX/sbin/postdrop
-    chmod 2755 $PREFIX/sbin/postdrop
+    install -o root -g wheel -m 544 \
+	$SAMPLE_CONFIG_DIR/{postfix-script,post-install} $CONFIG_DIR
+    install -o root -g wheel -m 444 \
+	$SAMPLE_CONFIG_DIR/postfix-files $CONFIG_DIR
+
+    $CONFIG_DIR/post-install command_directory=${PREFIX}/sbin set-permissions
 }
 
 # Function: tell the user what s/he needs to do to use the port just installed
diff --git a/mail/postfix/stable/pkg/PLIST b/mail/postfix/stable/pkg/PLIST
index 6584d3b1798..e1cd7833a48 100644
--- a/mail/postfix/stable/pkg/PLIST
+++ b/mail/postfix/stable/pkg/PLIST
@@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.3 2001/10/25 21:35:38 jakob Exp $
+@comment $OpenBSD: PLIST,v 1.4 2002/01/25 08:14:30 jakob Exp $
 @pkgcfl postfix-*
+%%tls%%
 libexec/postfix/bounce
 libexec/postfix/cleanup
 libexec/postfix/error
@@ -7,14 +8,17 @@ libexec/postfix/flush
 libexec/postfix/lmtp
 libexec/postfix/local
 libexec/postfix/master
+libexec/postfix/nqmgr
 libexec/postfix/pickup
 libexec/postfix/pipe
 libexec/postfix/qmgr
+libexec/postfix/qmqpd
 libexec/postfix/showq
 libexec/postfix/smtp
 libexec/postfix/smtpd
 libexec/postfix/spawn
 libexec/postfix/trivial-rewrite
+libexec/postfix/virtual
 man/man1/mailq.1
 man/man1/newaliases.1
 man/man1/postalias.1
@@ -26,6 +30,7 @@ man/man1/postkick.1
 man/man1/postlock.1
 man/man1/postlog.1
 man/man1/postmap.1
+man/man1/postqueue.1
 man/man1/postsuper.1
 man/man1/sendmail.1
 man/man5/access.5
@@ -44,14 +49,18 @@ man/man8/flush.8
 man/man8/lmtp.8
 man/man8/local.8
 man/man8/master.8
+man/man8/nqmgr.8
 man/man8/pickup.8
 man/man8/pipe.8
 man/man8/qmgr.8
+man/man8/qmqpd.8
 man/man8/showq.8
 man/man8/smtp.8
 man/man8/smtpd.8
 man/man8/spawn.8
 man/man8/trivial-rewrite.8
+man/man8/virtual.8
+sbin/mailq
 sbin/postalias
 sbin/postcat
 sbin/postconf
@@ -63,68 +72,91 @@ sbin/postkick
 sbin/postlock
 sbin/postlog
 sbin/postmap
+sbin/postqueue
 sbin/postsuper
 sbin/sendmail
-sbin/smtp-sink
-sbin/smtp-source
-share/doc/postfix/access.5.html
-share/doc/postfix/aliases.5.html
-share/doc/postfix/architecture.html
-share/doc/postfix/backstage.html
-share/doc/postfix/basic.html
-share/doc/postfix/big-picture.gif
-share/doc/postfix/big-picture.html
-share/doc/postfix/bounce.8.html
-share/doc/postfix/canonical.5.html
-share/doc/postfix/cleanup.8.html
-share/doc/postfix/commands.html
-share/doc/postfix/defer.8.html
-share/doc/postfix/delivering.html
-share/doc/postfix/error.8.html
-share/doc/postfix/faq.html
-share/doc/postfix/flush.8.html
-share/doc/postfix/goals.html
-share/doc/postfix/inbound.gif
-share/doc/postfix/index.html
-share/doc/postfix/lmtp.8.html
-share/doc/postfix/local.8.html
-share/doc/postfix/mailq.1.html
-share/doc/postfix/master.8.html
-share/doc/postfix/motivation.html
-share/doc/postfix/newaliases.1.html
-share/doc/postfix/outbound.gif
-share/doc/postfix/pcre_table.5.html
-share/doc/postfix/pickup.8.html
-share/doc/postfix/pipe.8.html
-share/doc/postfix/postalias.1.html
-share/doc/postfix/postcat.1.html
-share/doc/postfix/postconf.1.html
-share/doc/postfix/postdrop.1.html
-share/doc/postfix/postfix.1.html
-share/doc/postfix/postkick.1.html
-share/doc/postfix/postlock.1.html
-share/doc/postfix/postlog.1.html
-share/doc/postfix/postmap.1.html
-share/doc/postfix/postsuper.1.html
-share/doc/postfix/qmgr.8.html
-share/doc/postfix/queuing.html
-share/doc/postfix/rate.html
-share/doc/postfix/receiving.html
-share/doc/postfix/regexp_table.5.html
-share/doc/postfix/relocated.5.html
-share/doc/postfix/resource.html
-share/doc/postfix/rewrite.html
-share/doc/postfix/security.html
-share/doc/postfix/sendmail.1.html
-share/doc/postfix/showq.8.html
-share/doc/postfix/small-picture.gif
-share/doc/postfix/smtp.8.html
-share/doc/postfix/smtpd.8.html
-share/doc/postfix/spawn.8.html
-share/doc/postfix/transport.5.html
-share/doc/postfix/trivial-rewrite.8.html
-share/doc/postfix/uce.html
-share/doc/postfix/virtual.5.html
+share/doc/postfix/html/access.5.html
+share/doc/postfix/html/aliases.5.html
+share/doc/postfix/html/architecture.html
+share/doc/postfix/html/backstage.html
+share/doc/postfix/html/basic.html
+share/doc/postfix/html/big-picture.gif
+share/doc/postfix/html/big-picture.html
+share/doc/postfix/html/bounce.8.html
+share/doc/postfix/html/canonical.5.html
+share/doc/postfix/html/cleanup.8.html
+share/doc/postfix/html/commands.html
+share/doc/postfix/html/defer.8.html
+share/doc/postfix/html/delivering.html
+share/doc/postfix/html/error.8.html
+share/doc/postfix/html/faq.html
+share/doc/postfix/html/flush.8.html
+share/doc/postfix/html/goals.html
+share/doc/postfix/html/inbound.gif
+share/doc/postfix/html/index.html
+share/doc/postfix/html/lmtp.8.html
+share/doc/postfix/html/local.8.html
+share/doc/postfix/html/mailq.1.html
+share/doc/postfix/html/master.8.html
+share/doc/postfix/html/motivation.html
+share/doc/postfix/html/newaliases.1.html
+share/doc/postfix/html/nqmgr.8.html
+share/doc/postfix/html/outbound.gif
+share/doc/postfix/html/pcre_table.5.html
+share/doc/postfix/html/pickup.8.html
+share/doc/postfix/html/pipe.8.html
+share/doc/postfix/html/postalias.1.html
+share/doc/postfix/html/postcat.1.html
+share/doc/postfix/html/postconf.1.html
+share/doc/postfix/html/postdrop.1.html
+share/doc/postfix/html/postfix.1.html
+share/doc/postfix/html/postkick.1.html
+share/doc/postfix/html/postlock.1.html
+share/doc/postfix/html/postlog.1.html
+share/doc/postfix/html/postmap.1.html
+share/doc/postfix/html/postqueue.1.html
+share/doc/postfix/html/postsuper.1.html
+share/doc/postfix/html/qmgr.8.html
+share/doc/postfix/html/qmqpd.8.html
+share/doc/postfix/html/queuing.html
+share/doc/postfix/html/rate.html
+share/doc/postfix/html/receiving.html
+share/doc/postfix/html/regexp_table.5.html
+share/doc/postfix/html/relocated.5.html
+share/doc/postfix/html/resource.html
+share/doc/postfix/html/rewrite.html
+share/doc/postfix/html/security.html
+share/doc/postfix/html/sendmail.1.html
+share/doc/postfix/html/showq.8.html
+share/doc/postfix/html/small-picture.gif
+share/doc/postfix/html/smtp.8.html
+share/doc/postfix/html/smtpd.8.html
+share/doc/postfix/html/spawn.8.html
+share/doc/postfix/html/transport.5.html
+share/doc/postfix/html/trivial-rewrite.8.html
+share/doc/postfix/html/uce.html
+share/doc/postfix/html/virtual.5.html
+share/doc/postfix/html/virtual.8.html
+share/doc/postfix/readme/DB_README
+share/doc/postfix/readme/DEBUG_README
+share/doc/postfix/readme/ETRN_README
+share/doc/postfix/readme/FILTER_README
+share/doc/postfix/readme/INSTALL
+share/doc/postfix/readme/LDAP_README
+share/doc/postfix/readme/LINUX_README
+share/doc/postfix/readme/LMTP_README
+share/doc/postfix/readme/MACOSX_README
+share/doc/postfix/readme/MYSQL_README
+share/doc/postfix/readme/NFS_README
+share/doc/postfix/readme/PACKAGE_README
+share/doc/postfix/readme/PCRE_README
+share/doc/postfix/readme/QMQP_README
+share/doc/postfix/readme/RESTRICTION_CLASS_README
+share/doc/postfix/readme/SASL_README
+share/doc/postfix/readme/ULTRIX_README
+share/doc/postfix/readme/UUCP_README
+share/doc/postfix/readme/VERP_README
+share/doc/postfix/readme/VIRTUAL_README
 share/examples/postfix/LICENSE
 share/examples/postfix/access
 share/examples/postfix/aliases
@@ -133,10 +165,9 @@ share/examples/postfix/main.cf
 share/examples/postfix/main.cf.default
 share/examples/postfix/master.cf
 share/examples/postfix/pcre_table
+share/examples/postfix/post-install
+share/examples/postfix/postfix-files
 share/examples/postfix/postfix-script
-share/examples/postfix/postfix-script-diff
-share/examples/postfix/postfix-script-nosgid
-share/examples/postfix/postfix-script-sgid
 share/examples/postfix/regexp_table
 share/examples/postfix/relocated
 share/examples/postfix/sample-aliases.cf
@@ -150,9 +181,14 @@ share/examples/postfix/sample-ldap.cf
 share/examples/postfix/sample-lmtp.cf
 share/examples/postfix/sample-local.cf
 share/examples/postfix/sample-misc.cf
-share/examples/postfix/sample-pcre.cf
+share/examples/postfix/sample-pcre-access.cf
+share/examples/postfix/sample-pcre-body.cf
+share/examples/postfix/sample-pcre-header.cf
+share/examples/postfix/sample-qmqpd.cf
 share/examples/postfix/sample-rate.cf
-share/examples/postfix/sample-regexp.cf
+share/examples/postfix/sample-regexp-access.cf
+share/examples/postfix/sample-regexp-body.cf
+share/examples/postfix/sample-regexp-header.cf
 share/examples/postfix/sample-relocated.cf
 share/examples/postfix/sample-resource.cf
 share/examples/postfix/sample-rewrite.cf
@@ -162,7 +198,8 @@ share/examples/postfix/sample-transport.cf
 share/examples/postfix/sample-virtual.cf
 share/examples/postfix/transport
 share/examples/postfix/virtual
-%%tls%%
 @dirrm share/examples/postfix
+@dirrm share/doc/postfix/readme
+@dirrm share/doc/postfix/html
 @dirrm share/doc/postfix
 @dirrm libexec/postfix
diff --git a/mail/postfix/stable/pkg/SECURITY b/mail/postfix/stable/pkg/SECURITY
index 7c8f1b0d76b..1229957f61b 100644
--- a/mail/postfix/stable/pkg/SECURITY
+++ b/mail/postfix/stable/pkg/SECURITY
@@ -1,10 +1,10 @@
 security precautions taken, as recommended by the postfix INSTALL doc:
 
-installed with maildrop setgid, to eliminate the world-writable
-maildrop vulnerability (local users can present a denial of service).
+installed with postdrop setgid, to eliminate the world-writable
+postdrop vulnerability (local users can present a denial of service).
 
 all daemons chrooted in /var/spool/postfix.
 
-separate postfix user and group, and maildrop group.
+separate postfix user and group, and postdrop group.
 
 -d.