diff --git a/postfix/HISTORY b/postfix/HISTORY
index 0677106e2..819cc78a7 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -17603,10 +17603,10 @@ Apologies for any names omitted.
 20120130
 
 	Bugfix (introduced: Postfix 2.3): the trace service did not
-	distinguish between notifications for a non-bounce or a
-	bounce message. This code pre-dates DSN support and should
-	have been updated when it was re-purposed to handle DSN
-	SUCCESS notifications. Problem reported by Sabahattin
+	distinguish between DSN SUCCESS notifications for a non-bounce
+	or a bounce message. This code pre-dates DSN support and
+	should have been updated when it was re-purposed to handle
+	DSN SUCCESS notifications. Problem reported by Sabahattin
 	Gucukoglu.  File: bounce/bounce_trace_service.c.
 
 20120202
@@ -17616,3 +17616,16 @@ Apologies for any names omitted.
 	could match a shorter one, because a length check was done
 	on the wrong string.  Reported by Vladimir Vassiliev.  File:
 	cleanup/cleanup_milter.c.
+
+20120214
+
+        Bugfix (introduced: Postfix 2.4): extraneous null assignment
+        caused core dump when postlog emitted the "usage" message.
+        Reported by Kant (fnord.hammer). File: postlog/postlog.c.
+
+20120217
+
+	Bugfix (introduced 20111219): sendmail -bs segfault, due
+	to a missing guard statement after an smtpd_check_rewrite()
+	call was moved closer to the command processor loop. Fix
+	by Bartek Szady. File: smtpd/smtpd.c.
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 6cd9b3545..b53552213 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	"20120202"
+#define MAIL_RELEASE_DATE	"20120218"
 #define MAIL_VERSION_NUMBER	"2.10"
 
 #ifdef SNAPSHOT
diff --git a/postfix/src/global/verify_sender_addr.c b/postfix/src/global/verify_sender_addr.c
index c87181487..666f8e656 100644
--- a/postfix/src/global/verify_sender_addr.c
+++ b/postfix/src/global/verify_sender_addr.c
@@ -20,7 +20,7 @@
 /*	specified with the address_verify_sender parameter.
 /*
 /*	When the address_verify_sender parameter is empty or <>,
-/*	the sender address always the empty address (i.e. always
+/*	the sender address is always the empty address (i.e. always
 /*	time-independent).
 /*
 /*	The caller must initialize the address_verify_sender and
diff --git a/postfix/src/postlog/postlog.c b/postfix/src/postlog/postlog.c
index 90f0f2b4c..6384396bd 100644
--- a/postfix/src/postlog/postlog.c
+++ b/postfix/src/postlog/postlog.c
@@ -207,7 +207,6 @@ int     main(int argc, char **argv)
     if (isatty(STDERR_FILENO))
 	msg_vstream_init(tag, VSTREAM_ERR);
     msg_syslog_init(tag, LOG_PID, LOG_FACILITY);
-    tag = 0;
 
     /*
      * Check the Postfix library version as soon as we enable logging.
diff --git a/postfix/src/smtpd/smtpd.c b/postfix/src/smtpd/smtpd.c
index a95f08a97..aeecbf883 100644
--- a/postfix/src/smtpd/smtpd.c
+++ b/postfix/src/smtpd/smtpd.c
@@ -2353,12 +2353,14 @@ static int mail_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *argv)
 	    return (-1);
 	}
     }
-    err = smtpd_check_rewrite(state);
-    if (err != 0) {
-	/* XXX Reset access map side effects. */
-	mail_reset(state);
-	smtpd_chat_reply(state, "%s", err);
-	return (-1);
+    if (SMTPD_STAND_ALONE(state) == 0) {
+	err = smtpd_check_rewrite(state);
+	if (err != 0) {
+	    /* XXX Reset access map side effects. */
+	    mail_reset(state);
+	    smtpd_chat_reply(state, "%s", err);
+	    return (-1);
+	}
     }
 
     /*
diff --git a/postfix/src/util/netstring.c b/postfix/src/util/netstring.c
index 55eaabcf5..666b56e37 100644
--- a/postfix/src/util/netstring.c
+++ b/postfix/src/util/netstring.c
@@ -116,7 +116,7 @@
 /* .fi
 /* .ad
 /*	In case of error, a vstream_longjmp() call is performed to the
-/*	context specified with vstream_setjmp().
+/*	caller-provided context specified with vstream_setjmp().
 /*	Error codes passed along with vstream_longjmp() are:
 /* .IP NETSTRING_ERR_EOF
 /*	An I/O error happened, or the peer has disconnected unexpectedly.