diff --git a/ChangeLog b/ChangeLog
index 29ccd2c..d5f28a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,16 @@
      trusted CA with a non DER-compliant certificate. Found by luocm on GitHub.
      Fixes #825.
 
+Bugfix
+   * Add missing dependencies in test suites that led to build failures
+     in configurations that omit certain hashes or public-key algorithms.
+     Fixes #1040.
+
+Changes
+   * Improve testing in configurations that omit certain hashes or
+     public-key algorithms. Includes contributions by Gert van Dijk.
+   * Improve negative testing of X.509 parsing.
+
 = mbed TLS 2.1.11 branch released 2018-03-16
 
 Default behavior changes