diff --git a/ChangeLog b/ChangeLog
index 8c82d08d1..02e980184 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@ Bugfix
       MBEDTLS_THREADING_C is defined. Found by TrinityTonic, #1095
     * Fix a bug in the update function for SSL ticket keys which previously
       invalidated keys of a lifetime of less than a 1s. Fixes #1968.
+    * 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
    * Add tests for session resumption in DTLS.