diff --git a/include/polarssl/debug.h b/include/polarssl/debug.h
index 2dd89a2..406cfa8 100644
--- a/include/polarssl/debug.h
+++ b/include/polarssl/debug.h
@@ -57,7 +57,10 @@
 
 
 #define SSL_DEBUG_MSG( level, args )                    \
-    debug_print_msg_free( ssl, level, __FILE__, __LINE__, debug_fmt args );
+    do {                                                \
+        if( level <= debug_threshold )                  \
+            debug_print_msg_free( ssl, level, __FILE__, __LINE__, debug_fmt args ); \
+    } while( 0 )
 
 #define SSL_DEBUG_RET( level, text, ret )                \
     debug_print_ret( ssl, level, __FILE__, __LINE__, text, ret );
@@ -147,6 +150,8 @@
                       const char *text, const x509_crt *crt );
 #endif
 
+extern int debug_threshold;
+
 #ifdef __cplusplus
 }
 #endif