diff --git a/postfix/HISTORY b/postfix/HISTORY
index 2b3b4dd0a..ebf01fbc1 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -21008,3 +21008,8 @@ Apologies for any names omitted.
 	Cleanup: removed unnecessary casts. File: global/cfg_parser.c.
 
 	Cleanup: dont cast away "const". File: global/dict_sqlite.c.
+
+20141208
+
+	Bugfix (introduced: 20141207): in new #ifdef, && should be ||.
+	File: smtpd.c.
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index d2a577319..2755a3914 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	"20141207"
+#define MAIL_RELEASE_DATE	"20141208"
 #define MAIL_VERSION_NUMBER	"2.12"
 
 #ifdef SNAPSHOT
diff --git a/postfix/src/smtpd/smtpd.c b/postfix/src/smtpd/smtpd.c
index caef2c9a9..8d827305b 100644
--- a/postfix/src/smtpd/smtpd.c
+++ b/postfix/src/smtpd/smtpd.c
@@ -4625,7 +4625,7 @@ static void tls_reset(SMTPD_STATE *state)
 
 #endif
 
-#if !defined(USE_TLS) && !defined(USE_SASL_AUTH)
+#if !defined(USE_TLS) || !defined(USE_SASL_AUTH)
 
 /* unimpl_cmd - dummy for functionality that is not compiled in */