diff --git a/ChangeLog b/ChangeLog
index 4430d75e8..096d6ab17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,12 +13,12 @@ Bugfix
    * Fixed cert_app sample program for debug output and for use when no root
      certificates are provided.
    * Fix conditional statement that would cause a 1 byte overread in
-     mbedtls_asn1_get_int(). Found and fixed by Guido Vranken.
+     mbedtls_asn1_get_int(). Found and fixed by Guido Vranken. #599
+   * Fixed pthread implementation to avoid unintended double initialisations
+     and double frees. (found by Niklas Amnebratt)
    * Fixed the sample applications gen_key.c, cert_req.c and cert_write.c for
      builds where the configuration MBEDTLS_PEM_WRITE_C is not defined. Found
      by inestlerode. #559.
-   * Fixed pthread implementation to avoid unintended double initialisations
-     and double frees. (found by Niklas Amnebratt)
 
 = mbed TLS 2.1.5 branch released 2016-06-28