diff --git a/postfix/HISTORY b/postfix/HISTORY
index 836267297..20fa1ee17 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -16072,3 +16072,7 @@ Apologies for any names omitted.
 	will no longer result in repeated delivery to other mailing
 	list members.  Specify "reset_owner_alias = yes" for the
 	older behavior.  File: local/alias.c.
+
+20101007
+
+	Bugfix (introduced: 2100923): duplicate "PASS OLD" logging.
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index 953e47eef..8569f945f 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	"20101006"
+#define MAIL_RELEASE_DATE	"20101007"
 #define MAIL_VERSION_NUMBER	"2.8"
 
 #ifdef SNAPSHOT
diff --git a/postfix/src/postscreen/postscreen_misc.c b/postfix/src/postscreen/postscreen_misc.c
index 0015ba998..263a85020 100644
--- a/postfix/src/postscreen/postscreen_misc.c
+++ b/postfix/src/postscreen/postscreen_misc.c
@@ -101,7 +101,8 @@ void    ps_conclude(PS_STATE *state)
     /*
      * Log our final blessing when all unfinished tests were completed.
      */
-    if ((state->flags & PS_STATE_MASK_ANY_PASS) ==
+    if ((state->flags & PS_STATE_MASK_ANY_PASS) != 0
+	&& (state->flags & PS_STATE_MASK_ANY_PASS) ==
 	PS_STATE_FLAGS_TODO_TO_PASS(state->flags & PS_STATE_MASK_ANY_TODO))
 	msg_info("PASS %s %s", (state->flags & PS_STATE_FLAG_NEW) == 0 ?
 		 "OLD" : "NEW", state->smtp_client_addr);