diff --git a/ChangeLog b/ChangeLog
index 3b1c493..e1e3252 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,169610 @@
-ChangeLog is maintained by "git log".
+commit d53bfc6f04bf7c1eaf3105e34308b2cc284ab9b8
+Author: Niels de Vos <ndevos@redhat.com>
+Date:   Wed May 25 12:50:44 2016 +0200
+
+    doc: update work-in-progress release-notes for 3.8.0 RC2
+    
+    Added bugs addressed since RC1.
+    Included a note about building from the 'make dist' tarball.
+    
+    BUG: 1317278
+    Change-Id: Icc28f12cdbac496ac7b0bf2404ad731be98306c0
+    Signed-off-by: Niels de Vos <ndevos@redhat.com>
+
+commit 6c88889e333fcaaa8ddcd136f480108007e339c1
+Author: Pranith Kumar K <pkarampu@redhat.com>
+Date:   Thu May 19 16:24:09 2016 +0530
+
+    cluster/afr: Do not inode_link in afr
+    
+    Race is explained at
+    https://bugzilla.redhat.com/show_bug.cgi?id=1337405#c0
+    
+    This patch also handles performing of self-heal with shd-pid.
+    Also performs the healing with this->itable's inode rather than
+    main itable.
+    
+     >BUG: 1337405
+     >Change-Id: Id657a6623b71998b027b1dff6af5bbdf8cab09c9
+     >Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
+     >Reviewed-on: http://review.gluster.org/14422
+     >Smoke: Gluster Build System <jenkins@build.gluster.com>
+     >NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
+     >CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
+     >Reviewed-by: Krutika Dhananjay <kdhananj@redhat.com>
+    
+    BUG: 1337870
+    Change-Id: Ifb476eeed2ff73a44e481d64074599ab0707c725
+    Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
+    Reviewed-on: http://review.gluster.org/14455
+    Smoke: Gluster Build System <jenkins@build.gluster.com>
+    Reviewed-by: Krutika Dhananjay <kdhananj@redhat.com>
+    NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
+    CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
+    Reviewed-by: Niels de Vos <ndevos@redhat.com>

More commit messages for this ChangeLog can be found at
https://forge.gluster.org/glusterfs-core/glusterfs/commits/v3.8.0rc2
