diff --git a/ChangeLog b/ChangeLog
index 68fb0444b..cea98290b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@ Features
    * Added support for multi-domain certificates through the X509 Subject
      Alternative Name extension
 
+Changes
+   * Removed redundant POLARSSL_DEBUG_MSG define
+
 = Version 1.1.1 released on 2012-01-23
 Bugfix
    * Check for failed malloc() in ssl_set_hostname() and x509_get_entries()
diff --git a/include/polarssl/config.h b/include/polarssl/config.h
index 83319ccf0..bb9e6806d 100644
--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
@@ -146,15 +146,6 @@
 #define POLARSSL_CIPHER_NULL_CIPHER
  */
 
-/**
- * \def POLARSSL_DEBUG_MSG
- *
- * Requires: POLARSSL_DEBUG_C
- *
- * Enable all SSL/TLS debugging messages.
- */
-#define POLARSSL_DEBUG_MSG
-
 /**
  * \def POLARSSL_ENABLE_WEAK_CIPHERSUITES
  *
diff --git a/include/polarssl/debug.h b/include/polarssl/debug.h
index 4fb378228..511e926eb 100644
--- a/include/polarssl/debug.h
+++ b/include/polarssl/debug.h
@@ -30,7 +30,7 @@
 #include "config.h"
 #include "ssl.h"
 
-#if defined(POLARSSL_DEBUG_MSG) && defined(POLARSSL_DEBUG_C)
+#if defined(POLARSSL_DEBUG_C)
 
 #define SSL_DEBUG_MSG( level, args )                    \
     debug_print_msg( ssl, level, __FILE__, __LINE__, debug_fmt args );
diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 7547d9f07..fa476b927 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -178,7 +178,7 @@ static int ssl_write_client_hello( ssl_context *ssl )
 
 static int ssl_parse_server_hello( ssl_context *ssl )
 {
-#if defined(POLARSSL_DEBUG_MSG) && defined(POLARSSL_DEBUG_C)
+#if defined(POLARSSL_DEBUG_C)
     time_t t;
 #endif
     int ret, i;
@@ -228,7 +228,7 @@ static int ssl_parse_server_hello( ssl_context *ssl )
 
     ssl->minor_ver = buf[5];
 
-#if defined(POLARSSL_DEBUG_MSG) && defined(POLARSSL_DEBUG_C)
+#if defined(POLARSSL_DEBUG_C)
     t = ( (time_t) buf[6] << 24 )
       | ( (time_t) buf[7] << 16 )
       | ( (time_t) buf[8] <<  8 )