diff --git a/postfix/HISTORY b/postfix/HISTORY
index 90c996b0b..a6c374f94 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -15811,7 +15811,7 @@ Apologies for any names omitted.
 
 20100601
 
-	Feature: Postfix LDAP client support for RFC 2255 LDAP URLs.
+	Cleanup: Postfix LDAP client support for RFC 2255 LDAP URLs.
 	Victor Duchovni. Files: proto/ldap_table global/dict_ldap.c.
 
 	Safety: Postfix processes log a warning when a matchlist
diff --git a/postfix/html/postcat.1.html b/postfix/html/postcat.1.html
index de3ef5d18..52a2eb7da 100644
--- a/postfix/html/postcat.1.html
+++ b/postfix/html/postcat.1.html
@@ -20,7 +20,7 @@ POSTCAT(1)                                                          POSTCAT(1)
 
        By default, <a href="postcat.1.html"><b>postcat</b>(1)</a> shows the envelope and message con-
        tent,  as if the options <b>-beh</b> were specified. To view mes-
-       sage headers only, specify <b>-bh</b> (Postfix 2.7 and later).
+       sage content only, specify <b>-bh</b> (Postfix 2.7 and later).
 
        Options:
 
diff --git a/postfix/html/postconf.5.html b/postfix/html/postconf.5.html
index 7c7645ab8..4f897f9f8 100644
--- a/postfix/html/postconf.5.html
+++ b/postfix/html/postconf.5.html
@@ -6735,6 +6735,8 @@ the <a href="dnsblog.8.html">dnsblog(8)</a> daemon will query these domains with
 of non-whitelisted <a href="postscreen.8.html">postscreen(8)</a> clients. Specify a list of domain
 names, separated by comma or whitespace. </p>
 
+<p> This feature is available in Postfix 2.8. </p>
+
 
 </DD>
 
diff --git a/postfix/makedefs b/postfix/makedefs
index 7b56dd9e1..7432cdbdf 100644
--- a/postfix/makedefs
+++ b/postfix/makedefs
@@ -421,10 +421,10 @@ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix543
 		 [1-6].*) CCARGS="$CCARGS -DNO_IPV6";;
 		       *) CCARGS="$CCARGS -DBIND_8_COMPAT -DNO_NETINFO";;
 		esac
-		# Darwin 10.3.0 no longer has <arpa/nameser8_compat.h>.
+		# Darwin 10.3.0 no longer has <nameser8_compat.h>.
 		case $RELEASE in
 		     ?.*) CCARGS="$CCARGS -DRESOLVE_H_NEEDS_NAMESER8_COMPAT_H";;
-		       *) CCARGS="$CCARGS -DRESOLVE_H_NEEDS_NAMESER_COMPAT_H";;
+		       *) CCARGS="$CCARGS -DRESOLVE_H_NEEDS_ARPA_NAMESER_COMPAT_H";;
 		esac
 		# kqueue and/or poll are broken up to and including MacOS X 10.5
 		CCARGS="$CCARGS -DNO_KQUEUE"
diff --git a/postfix/man/man1/postcat.1 b/postfix/man/man1/postcat.1
index 57aacb9d5..bf01c06c4 100644
--- a/postfix/man/man1/postcat.1
+++ b/postfix/man/man1/postcat.1
@@ -20,7 +20,7 @@ standard input.
 
 By default, \fBpostcat\fR(1) shows the envelope and message
 content, as if the options \fB-beh\fR were specified. To
-view message headers only, specify \fB-bh\fR (Postfix 2.7
+view message content only, specify \fB-bh\fR (Postfix 2.7
 and later).
 
 Options:
diff --git a/postfix/man/man5/postconf.5 b/postfix/man/man5/postconf.5
index 3a6f8dae2..c575488d8 100644
--- a/postfix/man/man5/postconf.5
+++ b/postfix/man/man5/postconf.5
@@ -3787,6 +3787,8 @@ Optional list of DNS blocklist domains. When the list is non-enpty,
 the \fBdnsblog\fR(8) daemon will query these domains with the IP addresses
 of non-whitelisted \fBpostscreen\fR(8) clients. Specify a list of domain
 names, separated by comma or whitespace.
+.PP
+This feature is available in Postfix 2.8.
 .SH postscreen_greet_action (default: continue)
 The action that \fBpostscreen\fR(8) takes when an SMTP client speaks
 before its turn within the time specified with the postscreen_greet_wait
diff --git a/postfix/proto/postconf.proto b/postfix/proto/postconf.proto
index 70ea5a641..c4a5f4595 100644
--- a/postfix/proto/postconf.proto
+++ b/postfix/proto/postconf.proto
@@ -12570,6 +12570,8 @@ the dnsblog(8) daemon will query these domains with the IP addresses
 of non-whitelisted postscreen(8) clients. Specify a list of domain
 names, separated by comma or whitespace. </p>
 
+<p> This feature is available in Postfix 2.8. </p>
+
 %PARAM postscreen_dnsbl_action continue
 
 <p>The action that postscreen(8) takes when an SMTP client is listed
diff --git a/postfix/src/dns/dns.h b/postfix/src/dns/dns.h
index f26153862..212e00893 100644
--- a/postfix/src/dns/dns.h
+++ b/postfix/src/dns/dns.h
@@ -22,8 +22,8 @@
 #ifdef RESOLVE_H_NEEDS_NAMESER8_COMPAT_H
 #include <nameser8_compat.h>
 #endif
-#ifdef RESOLVE_H_NEEDS_NAMESER_COMPAT_H
-#include <nameser_compat.h>
+#ifdef RESOLVE_H_NEEDS_ARPA_NAMESER_COMPAT_H
+#include <arpa/nameser_compat.h>
 #endif
 #include <resolv.h>
 
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 0ca1913e3..e621dd140 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE	"20100601"
+#define MAIL_RELEASE_DATE	"20100603"
 #define MAIL_VERSION_NUMBER	"2.8"
 
 #ifdef SNAPSHOT
diff --git a/postfix/src/postcat/postcat.c b/postfix/src/postcat/postcat.c
index 62f85fee9..7c687bfe4 100644
--- a/postfix/src/postcat/postcat.c
+++ b/postfix/src/postcat/postcat.c
@@ -14,7 +14,7 @@
 /*
 /*	By default, \fBpostcat\fR(1) shows the envelope and message
 /*	content, as if the options \fB-beh\fR were specified. To
-/*	view message headers only, specify \fB-bh\fR (Postfix 2.7
+/*	view message content only, specify \fB-bh\fR (Postfix 2.7
 /*	and later).
 /*
 /*	Options: