diff --git a/ChangeLog b/ChangeLog
index 05f99e204b..5de36b41a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
 4.6.2 (not yet released)
 - issue #12225 Use https for documentation links
 - issue #12234 Fix schema export with too many tables
+- issue #12240 Avoid parsing non JSON responses as JSON
 
 4.6.1 (2016-05-02)
 - issue #12120 PMA_Util not found in insert_edit.lib.php