diff --git a/ChangeLog b/ChangeLog
index 8da33530cbf..8843af18db7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,29 @@
-* Tue Apr 28 2020 Klaus Wenninger <klaus.wenninger@aon.at> Pacemaker-2.0.4
+* Sat May 16 2020 Klaus Wenninger <klaus.wenninger@aon.at> Pacemaker-2.0.4-rc2
+- Changesets: 34
+- Diff: 34 files changed, 461 insertions(+), 142 deletions(-)
+
+- Fixes for regressions introduced in Pacemaker-2.0.0
+  + controller: properly detect remote node info requests
+
+- Fixes for regressions / new buggy features introduced in Pacemaker-2.0.4-rc1
+  + libpe_status: Apply node filtering to clone resource lists.
+  + libpe_status: Don't filter in pe__bundle_replica_output_text.
+  + libpe_status: Don't output unnecessary resource headers.
+  + libpe_status: Handle filtering of inactive resources.
+  + tools: get stonith_admin --list-targets working again
+  + tools: Print inactive resources by default with crm_mon xml output.
+
+- Changes since Pacemaker-2.0.4-rc1
+  + fencer: avoid infinite loop if device is removed during operation
+  + fencer: avoid possible use-of-NULL when parsing metadata
+  + libfencing, fencer: Improve parameter handling for RHCS-style fence-agents
+                - add `port` or `plug` parameter according to metadata
+                - `plug` parameter shown as non-required in the metadata
+  + controld: Avoid delay when recovering resources after shutdown-lock
+              expiration. (CLBZ#5424)
+  + fencing: Remove dangling 'pending' for completed DC fencing. (CLBZ#5401)
+
+* Tue Apr 28 2020 Klaus Wenninger <klaus.wenninger@aon.at> Pacemaker-2.0.4-rc1
 - Changesets: 442
 - Diff: 269 files changed, 21845 insertions(+), 13363 deletions(-)