diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 0b6ae69a8..c1b078a32 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -8,6 +8,7 @@ Changelog
  * Fix: Number of validation errors in each tab in the editor is now correctly reported again
  * Fix: Userbar now opens on devices with both touch and mouse (Josh Barr)
  * Fix: ``wagtail.wagtailadmin.wagtail_hooks`` no longer calls ``static`` during app load, so you can use ``ManifestStaticFilesStorage`` without calling ``collectstatic`` command
+ * Fix: Fixed crash on page save when a custom `Page` edit handler has been specified using the `edit_handler` attribute (Tim Heap)
 
 
 1.4.1 (17.03.2016)
diff --git a/docs/releases/1.4.2.rst b/docs/releases/1.4.2.rst
index 4bc426d0c..1b0929d24 100644
--- a/docs/releases/1.4.2.rst
+++ b/docs/releases/1.4.2.rst
@@ -17,3 +17,4 @@ Bug fixes
  * Number of validation errors in each tab in the editor is now correctly reported again
  * Userbar now opens on devices with both touch and mouse (Josh Barr)
  * ``wagtail.wagtailadmin.wagtail_hooks`` no longer calls ``static`` during app load, so you can use ``ManifestStaticFilesStorage`` without calling ``collectstatic`` command
+ * Fixed crash on page save when a custom ``Page`` edit handler has been specified using the ``edit_handler`` attribute (Tim Heap)