diff --git a/ChangeLog b/ChangeLog
index 3b1c493..22857cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,168269 @@
-ChangeLog is maintained by "git log".
+commit 74ab2d6f10f6494785c5eeb62169317904aabc57
+Author: Niels de Vos <ndevos@redhat.com>
+Date:   Mon May 16 13:17:08 2016 +0200
+
+    doc: add work-in-progress release-notes for 3.8.0
+    
+    Initial version of the release-notes. Follow up patches should extend
+    this and make it more useful and user friendly.
+    
+    BUG: 1317278
+    Change-Id: Ida961034e898fca6d99b5b95044be612a59c898f
+    Signed-off-by: Niels de Vos <ndevos@redhat.com>
+
+commit ef002764c8ec05d1ca7b658533250a588d0b8609
+Author: Poornima G <pgurusid@redhat.com>
+Date:   Tue May 10 02:35:22 2016 -0400
+
+    client: Fix the message ids
+    
+    The message id of PC_MSG_GFID_NULL was changed as a part of rebase
+    of http://review.gluster.org/#/c/11597. Fixing the same
+    
+    Backport of http://review.gluster.org/#/c/14276/
+    
+    Cherry picked from commit f3699f32fd8d468f757697fdacf4949b8d5312d5
+    > Change-Id: I773e02fb5695b6b55700046f4a4298ec475f8991
+    > Signed-off-by: Poornima G <pgurusid@redhat.com>
+    > Reviewed-on: http://review.gluster.org/14276
+    > Smoke: Gluster Build System <jenkins@build.gluster.com>
+    > NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
+    > Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
+    > CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
+    
+    Change-Id: I773e02fb5695b6b55700046f4a4298ec475f8991
+    BUG: 1334994
+    Signed-off-by: Poornima G <pgurusid@redhat.com>
+    Reviewed-on: http://review.gluster.org/14280
+    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>
+    Smoke: Gluster Build System <jenkins@build.gluster.com>
+
+commit 1ab8c44c56a13dc3fbc948bdfc1a3dfe80d66da9
+Author: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>

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