diff --git a/postfix/HISTORY b/postfix/HISTORY
index 65bb6baf8..de0699759 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -13461,3 +13461,17 @@ Apologies for any names omitted.
 	was introduced it broke "agressive" recipient duplicate
 	elimination with "enable_original_recipient = no".  File:
 	cleanup/cleanup_out_recipient.c.
+
+20070529
+
+	Bugfix (introduced Postfix 2.3): the sendmail/postdrop
+	commands would hang when trying to submit a message larger
+	than the per-message size limit. File: postdrop/postdrop.c.
+
+20070530
+
+	Sabotage the saboteur who insists on breaking Postfix by
+	adding gethostbyname() calls that cause maildir delivery
+	to fail when the machine name is not found in /etc/hosts,
+	or that cause Postfix processes to hang when the network
+	is down.
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index a46b605bc..eb26de4b5 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	"20070524"
-#define MAIL_VERSION_NUMBER	"2.4.2-RC2"
+#define MAIL_RELEASE_DATE	"20070530"
+#define MAIL_VERSION_NUMBER	"2.4.2"
 
 #ifdef SNAPSHOT
 # define MAIL_VERSION_DATE	"-" MAIL_RELEASE_DATE
diff --git a/postfix/src/postdrop/postdrop.c b/postfix/src/postdrop/postdrop.c
index 7668df8da..92170708f 100644
--- a/postfix/src/postdrop/postdrop.c
+++ b/postfix/src/postdrop/postdrop.c
@@ -438,9 +438,11 @@ int     main(int argc, char **argv)
 	if (REC_PUT_BUF(dst->stream, rec_type, buf) < 0) {
 	    /* rec_get() errors must not clobber errno. */
 	    saved_errno = errno;
-	    while (rec_get_raw(VSTREAM_IN, buf, var_line_limit,
-			       REC_FLAG_NONE) > 0)
-		 /* void */ ;
+	    while ((rec_type = rec_get_raw(VSTREAM_IN, buf, var_line_limit,
+					   REC_FLAG_NONE)) != REC_TYPE_END
+		   && rec_type != REC_TYPE_EOF)
+		if (rec_type == REC_TYPE_ERROR)
+		    msg_fatal("uid=%ld: malformed input", (long) uid);
 	    errno = saved_errno;
 	    break;
 	}
diff --git a/postfix/src/util/get_hostname.c b/postfix/src/util/get_hostname.c
index fcf4a7f7f..eb2cfea06 100644
--- a/postfix/src/util/get_hostname.c
+++ b/postfix/src/util/get_hostname.c
@@ -61,13 +61,23 @@ const char *get_hostname(void)
      * part of the socket interface library. We avoid the more politically-
      * correct uname() routine because that has no portable way of dealing
      * with long (FQDN) hostnames.
+     * 
+     * DO NOT CALL GETHOSTBYNAME FROM THIS FUNCTION. IT BREAKS MAILDIR DELIVERY
+     * AND OTHER THINGS WHEN THE MACHINE NAME IS NOT FOUND IN /ETC/HOSTS OR
+     * CAUSES PROCESSES TO HANG WHEN THE NETWORK IS DISCONNECTED.
+     * 
+     * POSTFIX NO LONGER NEEDS A FULLY QUALIFIED HOSTNAME. INSTEAD POSTFIX WILL
+     * USE A DEFAULT DOMAIN NAME "LOCALDOMAIN".
      */
     if (my_host_name == 0) {
+	/* DO NOT CALL GETHOSTBYNAME FROM THIS FUNCTION */
 	if (gethostname(namebuf, sizeof(namebuf)) < 0)
 	    msg_fatal("gethostname: %m");
 	namebuf[MAXHOSTNAMELEN] = 0;
+	/* DO NOT CALL GETHOSTBYNAME FROM THIS FUNCTION */
 	if (valid_hostname(namebuf, DO_GRIPE) == 0)
 	    msg_fatal("unable to use my own hostname");
+	/* DO NOT CALL GETHOSTBYNAME FROM THIS FUNCTION */
 	my_host_name = mystrdup(namebuf);
     }
     return (my_host_name);