diff --git a/ChangeLog b/ChangeLog
index 8797b1af69..7ec43166f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 mbed TLS ChangeLog (Sorted per branch, date)
 
+= mbed TLS x.x.x branch released xxxx-xx-xx
+
+Bugfix
+   * Remove invalid use of size zero arrays in ECJPAKE test suite.
+
 = mbed TLS 2.5.0 branch released 2017-05-17
 
 Security