diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 7c38363381..3587b6c7ad 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -44,6 +44,7 @@ Changelog
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
  * Added error notification when running the `wagtail` command on Python <3.4 (Matt Westcott)
+ * Added error handling to the Draftail editor (Thibaud Colas)
  * Fix: Draftail now supports features specified via the `WAGTAILADMIN_RICH_TEXT_EDITORS` setting (Todd Dembrey)
  * Fix: Password reset form no longer indicates whether the email is recognised, as per standard Django behaviour (Bertrand Bordage)
  * Fix: `UserAttributeSimilarityValidator` is now correctly enforced on user creation / editing forms (Tim Heap)
diff --git a/docs/releases/2.0.1.rst b/docs/releases/2.0.1.rst
index d2deabacf4..6feb3436f6 100644
--- a/docs/releases/2.0.1.rst
+++ b/docs/releases/2.0.1.rst
@@ -11,6 +11,7 @@ What's new
 ==========
 
  * Added error notification when running the ``wagtail`` command on Python <3.4 (Matt Westcott)
+ * Added error handling to the Draftail editor (Thibaud Colas)
 
 Bug fixes
 ~~~~~~~~~