diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ecd9d8b060..32316ecc55 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Changelog
 
  * New page privacy options (Shawn Makinson, Tom Miller, Luca Perico, Matt Westcott)
  * New 'bulk delete' permission type for deleting pages with children (Matt Westcott)
+ * Elasticsearch 5 support (Karl Hobley)
  * Added support of a custom `edit_handler` in site settings (Axel Haustant)
  * Added `get_landing_page_template` getter method to `AbstractForm` (Gagaro)
  * Added `Page.get_admin_display_title` method to override how the title is displayed in the admin (Henk-Jan van Hasselaar)
diff --git a/docs/releases/1.8.rst b/docs/releases/1.8.rst
index 9228a8f506..565f49f910 100644
--- a/docs/releases/1.8.rst
+++ b/docs/releases/1.8.rst
@@ -29,6 +29,12 @@ See: :ref:`permissions`
 This feature was developed by Matt Westcott.
 
 
+Elasticsearch 5 support
+~~~~~~~~~~~~~~~~~~~~~~~
+
+Wagtail now supports Elasticsearch 5. See :ref:`wagtailsearch_backends_elasticsearch` for configuration details. This feature was developed by Karl Hobley.
+
+
 Minor features
 ~~~~~~~~~~~~~~