diff --git a/ChangeLog b/ChangeLog
index 6e79644..d127877 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,10 @@
    * Fix a bug in the record decryption routine ssl_decrypt_buf()
      which lead to accepting properly authenticated but improperly
      padded records in case of CBC ciphersuites using Encrypt-then-MAC.
+   * Fix wrong order of freeing in programs/ssl/ssl_server2 example
+     application leading to a memory leak in case both
+     MBEDTLS_MEMORY_BUFFER_ALLOC_C and MBEDTLS_MEMORY_BACKTRACE are set.
+     Fixes #2069.
 
 Changes
    * "make apidoc" now generates the documentation for the current