diff --git a/ChangeLog b/ChangeLog
index 0eb070212..ed8cb16cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -54,6 +54,9 @@ Bugfix
 
 Changes
    * Clarified the documentation of mbedtls_ssl_setup.
+   * Improve robustness of mbedtls_ssl_derive_keys against the use of
+     HMAC functions with non-HMAC ciphersuites. Independently contributed
+     by Jiayuan Chen in #1377. Fixes #1437.
 
 = mbed TLS 2.1.10 branch released 2018-02-03