diff --git a/ChangeLog b/ChangeLog
index 68b1255..57024a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 
 = mbed TLS 2.1.2 released 2015-10-xx
 
+Security
+   * Fix potential heap buffer overflow in servers that perform client
+     authentication against a crafted CA cert. Cannot be triggered remotely
+     unless you allow third parties to pick trust CAs for client auth.
+     Found by Guido Vranken.
+
 Changes
    * Fixed paths for check_config.h in example config files. (Found by bachp)
      (#291)