diff --git a/ChangeLog b/ChangeLog
index 3b1c493..80ba0a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,181303 @@
-ChangeLog is maintained by "git log".
+commit 104d07555719cd9c4d8e6b9477f6a3b1e1c14a38
+Author: Jiffin Tony Thottan <jthottan@redhat.com>
+Date:   Mon Apr 10 17:36:50 2017 +0530
+
+    doc : release-notes for GlusterFS-3.8.11
+    
+    BUG: 1431410
+    Change-Id: Iaf1d9603221bc0c70ad1695f5aa0afc2d651d737
+    Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
+    Reviewed-on: https://review.gluster.org/17028
+    CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
+    Reviewed-by: Niels de Vos <ndevos@redhat.com>
+    NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
+    Smoke: Gluster Build System <jenkins@build.gluster.org>
+
+commit d71ec72b981d110199c3376f39f91b704241975c
+Author: Krutika Dhananjay <kdhananj@redhat.com>
+Date:   Thu Apr 6 18:10:41 2017 +0530
+
+    features/shard: Fix vm corruption upon fix-layout
+    
+            Backport of: https://review.gluster.org/17010
+    
+    shard's writev implementation, as part of identifying
+    presence of participant shards that aren't in memory,
+    first sends an MKNOD on these shards, and upon EEXIST error,
+    looks up the shards before proceeding with the writes.
+    
+    The VM corruption was caused when the following happened:
+    1. DHT had n subvolumes initially.
+    2. Upon add-brick + fix-layout, the layout of .shard changed
+       although the existing shards under it were yet to be migrated
+       to their new hashed subvolumes.
+    3. During this time, there were writes on the VM falling in regions
+       of the file whose corresponding shards were already existing under
+       .shard.
+    4. Sharding xl sent MKNOD on these shards, now creating them in their
+       new hashed subvolumes although there already exist shard blocks for
+       this region with valid data.
+    5. All subsequent writes were wound on these newly created copies.
+    
+    The net outcome is that both copies of the shard didn't have the correct
+    data. This caused the affected VMs to be unbootable.
+    

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