diff --git a/mail/postfix/stable/Makefile b/mail/postfix/stable/Makefile
index 4d32ddd9290..9f367168a33 100644
--- a/mail/postfix/stable/Makefile
+++ b/mail/postfix/stable/Makefile
@@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.60 2004/04/25 10:36:40 jakob Exp $
+# $OpenBSD: Makefile,v 1.61 2004/04/27 12:02:23 jakob Exp $
 
 VERSION=	2.1.0
 
 DISTNAME=	postfix-${VERSION}
-PKGNAME=	postfix-${VERSION}
+PKGNAME=	postfix-${VERSION}p1
 
 MAINTAINER=	Jakob Schlyter <jakob@openbsd.org>
 
 MASTER_SITES=	${MASTER_SITE_POSTFIX:=official/}
 
-IPV6VERSION=	1.22
+IPV6VERSION=	1.23
 IPV6POSTFIX=	2.1.0
 
 TLSHOMEPAGE=	http://www.aet.tu-cottbus.de/personen/jaenicke/pfixtls/
@@ -23,7 +23,7 @@ MAKE_AUXLIBS+=	-lssl -lcrypto
 
 PATCH_DIST_STRIP=-p1
 PATCHFILES+=	tls+ipv6-${IPV6VERSION}-pf-${IPV6POSTFIX}.patch.gz:0
-MASTER_SITES0=	ftp://ftp.suse.com/pub/people/choeger/postfix-2.1/source/
+MASTER_SITES0=	http://www.ipnet6.org/postfix/download/
 
 post-patch:
 	@find ${WRKSRC} -type f -name '*.bak.orig' -print | xargs rm
diff --git a/mail/postfix/stable/distinfo b/mail/postfix/stable/distinfo
index a742897559f..9273ff4a2b0 100644
--- a/mail/postfix/stable/distinfo
+++ b/mail/postfix/stable/distinfo
@@ -1,6 +1,6 @@
 MD5 (postfix/postfix-2.1.0.tar.gz) = 286856c9597cfa244c3b6133dce12749
-MD5 (postfix/tls+ipv6-1.22-pf-2.1.0.patch.gz) = b900c8a2fc99256f6a4c752ffbfc54db
+MD5 (postfix/tls+ipv6-1.23-pf-2.1.0.patch.gz) = 48cc27eba89a64bf34e03e4c9f48ece1
 RMD160 (postfix/postfix-2.1.0.tar.gz) = 0a3490610961dc58a5f2114fe68e2d685dc2e6a8
-RMD160 (postfix/tls+ipv6-1.22-pf-2.1.0.patch.gz) = 1c64dffe47f0ec415a8b95c6e65bfb5b081c708d
+RMD160 (postfix/tls+ipv6-1.23-pf-2.1.0.patch.gz) = 053459cc6ee7821768430c7ecece0732516fc8b6
 SHA1 (postfix/postfix-2.1.0.tar.gz) = e47da6dd31b404da092f8c253a8397d68ddf6098
-SHA1 (postfix/tls+ipv6-1.22-pf-2.1.0.patch.gz) = a716187f15a09559eb75f080ae10263b008e2a68
+SHA1 (postfix/tls+ipv6-1.23-pf-2.1.0.patch.gz) = c976114424df125c77d50ecbedf96c6efd6a9ae0
diff --git a/mail/postfix/stable/patches/patch-master.cf b/mail/postfix/stable/patches/patch-master.cf
index 52b1782a2ec..05feabec4ab 100644
--- a/mail/postfix/stable/patches/patch-master.cf
+++ b/mail/postfix/stable/patches/patch-master.cf
@@ -1,24 +1,19 @@
-$OpenBSD: patch-master.cf,v 1.7 2004/04/25 10:36:40 jakob Exp $
-
---- conf/master.cf.orig	Sat Apr 24 23:39:28 2004
-+++ conf/master.cf	Sat Apr 24 23:42:33 2004
-@@ -77,33 +77,33 @@
+--- conf/master.cf.orig	Tue Apr 27 13:31:58 2004
++++ conf/master.cf	Tue Apr 27 13:33:23 2004
+@@ -77,30 +77,30 @@
  # service type  private unpriv  chroot  wakeup  maxproc command + args
  #               (yes)   (yes)   (yes)   (never) (100)
  # ==========================================================================
 -smtp      inet  n       -       n       -       -       smtpd
--#smtps    inet  n       -       n       -       -       smtpd
+-#submission inet n      -       n       -       -       smtpd
 +smtp      inet  n       -       -       -       -       smtpd
-+#smtps    inet  n       -       -       -       -       smtpd
- #  -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes
- #submission   inet    n       -       n       -       -       smtpd
- #  -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes -o smtpd_etrn_restrictions=reject
++#submission inet n      -       -       -       -       smtpd
+ #	-o smtpd_etrn_restrictions=reject
 -#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       oqmgr
--#tlsmgr   fifo  -       -       n       300     1       tlsmgr
 -rewrite   unix  -       -       n       -       -       trivial-rewrite
 -bounce    unix  -       -       n       -       0       bounce
 -defer     unix  -       -       n       -       0       bounce
@@ -30,7 +25,6 @@ $OpenBSD: patch-master.cf,v 1.7 2004/04/25 10:36:40 jakob Exp $
 +cleanup   unix  n       -       -       -       0       cleanup
 +qmgr      fifo  n       -       -       300     1       qmgr
 +#qmgr     fifo  n       -       -       300     1       oqmgr
-+#tlsmgr   fifo  -       -       -       300     1       tlsmgr
 +rewrite   unix  -       -       -       -       -       trivial-rewrite
 +bounce    unix  -       -       -       -       0       bounce
 +defer     unix  -       -       -       -       0       bounce