diff --git a/mail/postfix/snapshot/Makefile b/mail/postfix/snapshot/Makefile
index e37f5c9ec47..56a2251d601 100644
--- a/mail/postfix/snapshot/Makefile
+++ b/mail/postfix/snapshot/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.137 2006/06/26 18:51:13 jakob Exp $
+# $OpenBSD: Makefile,v 1.138 2006/06/30 15:33:58 jakob Exp $
 
-VERSION=	2.3-20060616
-DISTNAME=	postfix-${VERSION}-nonprod
-PKGNAME=	postfix-${VERSION:S/-/./}p0
+VERSION=	2.3-RC1
+DISTNAME=	postfix-${VERSION}
+PKGNAME=	postfix-${VERSION:S/-/./}
 
 MASTER_SITES=	${MASTER_SITE_POSTFIX:=experimental/}
 
diff --git a/mail/postfix/snapshot/distinfo b/mail/postfix/snapshot/distinfo
index ef25116632d..2fba21c1c8b 100644
--- a/mail/postfix/snapshot/distinfo
+++ b/mail/postfix/snapshot/distinfo
@@ -1,4 +1,4 @@
-MD5 (postfix/postfix-2.3-20060616-nonprod.tar.gz) = 755f921d5bcbfd71a1079e76af941030
-RMD160 (postfix/postfix-2.3-20060616-nonprod.tar.gz) = 3753ec61cb469e4ad78c0bd73b2b4958855f6c9a
-SHA1 (postfix/postfix-2.3-20060616-nonprod.tar.gz) = 896f00ec3d5a8bec3370554ae4c6dd1191063d77
-SIZE (postfix/postfix-2.3-20060616-nonprod.tar.gz) = 2745984
+MD5 (postfix/postfix-2.3-RC1.tar.gz) = 62e4a13a85d8f7075b2925c42e24b08e
+RMD160 (postfix/postfix-2.3-RC1.tar.gz) = 5bb98de558e6621e1d2917b25374bd99b9bc72d0
+SHA1 (postfix/postfix-2.3-RC1.tar.gz) = 0f9d6e426d93e2ab13716ac463ff0bdc0f5c8494
+SIZE (postfix/postfix-2.3-RC1.tar.gz) = 2756227
diff --git a/mail/postfix/snapshot/patches/patch-conf_postfix-files b/mail/postfix/snapshot/patches/patch-conf_postfix-files
deleted file mode 100644
index c6b3b4ca744..00000000000
--- a/mail/postfix/snapshot/patches/patch-conf_postfix-files
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-conf_postfix-files,v 1.1 2006/06/16 15:52:19 jakob Exp $
---- conf/postfix-files.orig	Fri Jun 16 17:46:02 2006
-+++ conf/postfix-files	Fri Jun 16 17:46:33 2006
-@@ -246,6 +246,7 @@ $readme_directory/LMTP_README:f:root:-:6
- $readme_directory/LOCAL_RECIPIENT_README:f:root:-:644
- $readme_directory/MACOSX_README:f:root:-:644:o
- $readme_directory/MAILDROP_README:f:root:-:644
-+$readme_directory/MILTER_README:f:root:-:644
- $readme_directory/MYSQL_README:f:root:-:644
- $readme_directory/NFS_README:f:root:-:644
- $readme_directory/OVERVIEW:f:root:-:644
-@@ -293,6 +294,7 @@ $html_directory/LINUX_README.html:f:root
- $html_directory/LMTP_README.html:f:root:-:644
- $html_directory/LOCAL_RECIPIENT_README.html:f:root:-:644
- $html_directory/MAILDROP_README.html:f:root:-:644
-+$html_directory/MILTER_README.html:f:root:-:644
- $html_directory/MYSQL_README.html:f:root:-:644
- $html_directory/NFS_README.html:f:root:-:644
- $html_directory/OVERVIEW.html:f:root:-:644
diff --git a/mail/postfix/snapshot/patches/patch-src_milter_milter8_c b/mail/postfix/snapshot/patches/patch-src_milter_milter8_c
deleted file mode 100644
index e226b02e79c..00000000000
--- a/mail/postfix/snapshot/patches/patch-src_milter_milter8_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_milter_milter8_c,v 1.1 2006/06/26 18:51:13 jakob Exp $
---- src/milter/milter8.c.orig	Mon Jun 26 19:46:26 2006
-+++ src/milter/milter8.c	Mon Jun 26 12:49:15 2006
-@@ -1085,7 +1085,7 @@ static const char *milter8_event(MILTER8
- 		|| !ISDIGIT(STR(milter->buf)[1])
- 		|| !ISDIGIT(STR(milter->buf)[2])
- 		|| (STR(milter->buf)[3] != ' ' && STR(milter->buf)[3] != '-')
--		|| STR(milter->buf)[4] != STR(milter->buf)[1]) {
-+		|| STR(milter->buf)[4] != STR(milter->buf)[0]) {
- 		msg_warn("milter %s: malformed reply: %s",
- 			 milter->m.name, STR(milter->buf));
- 		milter8_conf_error(milter);