diff --git a/postfix/README_FILES/ADDRESS_VERIFICATION_README b/postfix/README_FILES/ADDRESS_VERIFICATION_README
index e27184138..36ebb6fc9 100644
--- a/postfix/README_FILES/ADDRESS_VERIFICATION_README
+++ b/postfix/README_FILES/ADDRESS_VERIFICATION_README
@@ -103,9 +103,10 @@ LLiimmiittaattiioonnss ooff aaddddrreessss vveerriiffi
     response to end of DATA after a message is transferred. Postfix address
     verification does not work with such sites.
 
-  * By default, Postfix probe messages have "postmaster@$myorigin" as the
-    sender address. This is SAFE because the Postfix SMTP server does not
-    reject mail for this address.
+  * By default, Postfix probe messages have "double-bounce@$myorigin" as the
+    sender address (with Postfix versions before 2.5, the default is
+    "postmaster@$myorigin"). This is SAFE because the Postfix SMTP server does
+    not reject mail for this address.
 
     You can change this into the null address ("address_verify_sender ="). This
     is UNSAFE because address probes will fail with mis-configured sites that
diff --git a/postfix/html/ADDRESS_VERIFICATION_README.html b/postfix/html/ADDRESS_VERIFICATION_README.html
index 70c6e6f22..5354649a8 100644
--- a/postfix/html/ADDRESS_VERIFICATION_README.html
+++ b/postfix/html/ADDRESS_VERIFICATION_README.html
@@ -207,9 +207,10 @@ delivery failure in response to end of DATA after a message is
 transferred.  Postfix address verification does not work with such
 sites. </p>
 
-<li> <p> By default, Postfix probe messages have "postmaster@$<a href="postconf.5.html#myorigin">myorigin</a>"
-as the sender address. This is SAFE because the Postfix SMTP server
-does not reject mail for this address. </p>
+<li> <p> By default, Postfix probe messages have "double-bounce@$<a href="postconf.5.html#myorigin">myorigin</a>"
+as the sender address (with Postfix versions before 2.5, the default
+is "postmaster@$<a href="postconf.5.html#myorigin">myorigin</a>"). This is SAFE because the Postfix SMTP
+server does not reject mail for this address. </p>
 
 <p> You can change this into the null address ("<a href="postconf.5.html#address_verify_sender">address_verify_sender</a>
 ="). This is UNSAFE because address probes will fail with
diff --git a/postfix/html/master.8.html b/postfix/html/master.8.html
index 859474805..9cd65b365 100644
--- a/postfix/html/master.8.html
+++ b/postfix/html/master.8.html
@@ -171,6 +171,7 @@ MASTER(8)                                                            MASTER(8)
        /etc/postfix/<a href="postconf.5.html">main.cf</a>, global configuration file.
        /etc/postfix/<a href="master.5.html">master.cf</a>, master server configuration file.
        /var/spool/postfix/pid/master.pid, master lock file.
+       /var/lib/postfix/master.lock, master lock file.
 
 <b>SEE ALSO</b>
        <a href="qmgr.8.html">qmgr(8)</a>, queue manager
diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html
index 7144efacd..f442ec2c5 100644
--- a/postfix/html/postconf.5.html
+++ b/postfix/html/postconf.5.html
@@ -13211,7 +13211,7 @@ This feature is available in Postfix 2.1 and later.
 (default: 450)</b></DT><DD>
 
 <p>
-The numerical Postfix SMTP server response code when a recipient
+The numerical Postfix SMTP server response code when a sender
 address is rejected by the <a href="postconf.5.html#reject_unverified_sender">reject_unverified_sender</a> restriction.
 </p>
 
diff --git a/postfix/html/smtpd.8.html b/postfix/html/smtpd.8.html
index 555ff650c..b8e46e6d3 100644
--- a/postfix/html/smtpd.8.html
+++ b/postfix/html/smtpd.8.html
@@ -956,7 +956,7 @@ SMTPD(8)                                                              SMTPD(8)
 
        <b><a href="postconf.5.html#unverified_sender_reject_code">unverified_sender_reject_code</a> (450)</b>
               The numerical Postfix  SMTP  server  response  code
-              when   a  recipient  address  is  rejected  by  the
+              when   a   sender   address   is  rejected  by  the
               <a href="postconf.5.html#reject_unverified_sender">reject_unverified_sender</a> restriction.
 
        <b><a href="postconf.5.html#unverified_recipient_reject_code">unverified_recipient_reject_code</a> (450)</b>
diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5
index ed6cb4a36..22a574184 100644
--- a/postfix/man/man5/postconf.5
+++ b/postfix/man/man5/postconf.5
@@ -8132,7 +8132,7 @@ Do not change this unless you have a complete understanding of RFC 821.
 .PP
 This feature is available in Postfix 2.1 and later.
 .SH unverified_sender_reject_code (default: 450)
-The numerical Postfix SMTP server response code when a recipient
+The numerical Postfix SMTP server response code when a sender
 address is rejected by the reject_unverified_sender restriction.
 .PP
 Unlike elsewhere in Postfix, you can specify 250 in order to
diff --git a/postfix/man/man8/master.8 b/postfix/man/man8/master.8
index bc20cda9d..9d74c4ef0 100644
--- a/postfix/man/man8/master.8
+++ b/postfix/man/man8/master.8
@@ -151,6 +151,7 @@ records, so that "smtpd" becomes, for example, "postfix/smtpd".
 /etc/postfix/main.cf, global configuration file.
 /etc/postfix/master.cf, master server configuration file.
 /var/spool/postfix/pid/master.pid, master lock file.
+/var/lib/postfix/master.lock, master lock file.
 .SH "SEE ALSO"
 .na
 .nf
diff --git a/postfix/man/man8/smtpd.8 b/postfix/man/man8/smtpd.8
index b0014b5c6..0714d2d54 100644
--- a/postfix/man/man8/smtpd.8
+++ b/postfix/man/man8/smtpd.8
@@ -769,7 +769,7 @@ verification request in progress.
 The sender address to use in address verification probes; prior
 to Postfix 2.5 the default was "postmaster".
 .IP "\fBunverified_sender_reject_code (450)\fR"
-The numerical Postfix SMTP server response code when a recipient
+The numerical Postfix SMTP server response code when a sender
 address is rejected by the reject_unverified_sender restriction.
 .IP "\fBunverified_recipient_reject_code (450)\fR"
 The numerical Postfix SMTP server response when a recipient address
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 06fe174c1..4086429b9 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,8 +20,8 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE	"20080501"
-#define MAIL_VERSION_NUMBER	"2.5.2-RC3"
+#define MAIL_RELEASE_DATE	"20080507"
+#define MAIL_VERSION_NUMBER	"2.5.2"
 
 #ifdef SNAPSHOT
 # define MAIL_VERSION_DATE	"-" MAIL_RELEASE_DATE
diff --git a/postfix/src/smtpd/smtpd.c b/postfix/src/smtpd/smtpd.c
index ed5999f09..740d1bf4e 100644
--- a/postfix/src/smtpd/smtpd.c
+++ b/postfix/src/smtpd/smtpd.c
@@ -719,7 +719,7 @@
 /*	The sender address to use in address verification probes; prior
 /*	to Postfix 2.5 the default was "postmaster".
 /* .IP "\fBunverified_sender_reject_code (450)\fR"
-/*	The numerical Postfix SMTP server response code when a recipient
+/*	The numerical Postfix SMTP server response code when a sender
 /*	address is rejected by the reject_unverified_sender restriction.
 /* .IP "\fBunverified_recipient_reject_code (450)\fR"
 /*	The numerical Postfix SMTP server response when a recipient address
