diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index bf67eed44..78e08a37f 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+1.12.4 (IN DEVELOPMENT)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* Fix: Fix support of `ATOMIC_REBUILD` for projects with Elasticsearch client >=1.7.0 (Mikalai Radchuk)
+
+
 1.12.3 (17.11.2017)
 ~~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/releases/1.12.4.rst b/docs/releases/1.12.4.rst
new file mode 100644
index 000000000..a0301938c
--- /dev/null
+++ b/docs/releases/1.12.4.rst
@@ -0,0 +1,16 @@
+============================
+Wagtail 1.12.4 release notes
+============================
+
+.. contents::
+    :local:
+    :depth: 1
+
+
+What's new
+==========
+
+Bug fixes
+~~~~~~~~~
+
+* Fix support of ``ATOMIC_REBUILD`` for projects with Elasticsearch client ``>=1.7.0`` (Mikalai Radchuk)
diff --git a/docs/releases/index.rst b/docs/releases/index.rst
index ead430a93..99148bc5f 100644
--- a/docs/releases/index.rst
+++ b/docs/releases/index.rst
@@ -5,6 +5,7 @@ Release notes
    :maxdepth: 1
 
    upgrading
+   1.12.4
    1.12.3
    1.12.2
    1.12.1