diff --git a/ChangeLog b/ChangeLog
index 3b1c493..6d7bab7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,178365 @@
-ChangeLog is maintained by "git log".
+commit 7638c2fef0e875d7e3f0cf524c37a9bef6931d81
+Author: Niels de Vos <ndevos@redhat.com>
+Date:   Mon Dec 12 09:41:22 2016 +0100
+
+    doc: release-notes for GlusterFS-3.8.7
+    
+    BUG: 1397911
+    Change-Id: I7522079ff9fb29588f0b3d716d89f88b04ab7b39
+    Signed-off-by: Niels de Vos <ndevos@redhat.com>
+    Reviewed-on: http://review.gluster.org/16104
+    Smoke: Gluster Build System <jenkins@build.gluster.org>
+    CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
+    NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
+
+commit d1cb82ef4154c52c8c9b7a95c5016b97d9babf10
+Author: Krutika Dhananjay <kdhananj@redhat.com>
+Date:   Thu Dec 8 22:49:48 2016 +0530
+
+    cluster/afr: Fix per-txn optimistic changelog initialisation
+    
+            Backport of: http://review.gluster.org/16075
+    
+    Incorrect initialisation of local->optimistic_change_log was leading
+    to skipped pre-op and post-op even when a brick didn't participate in
+    the txn because it was down.
+    The result - missing granular name index resulting in some entries
+    never getting healed.
+    
+    FIX:
+    Initialise local->optimistic_change_log just before pre-op.
+    
+    Also fixed granular entry heal to create the granular name index in
+    pre-op as opposed to post-op. This is to prevent loss of granular
+    information when during an entry txn, the good (src) brick goes
+    offline before the post-op is done. This would cause self-heal to
+    do conservative merge (since dirty xattr is the only information
+    available), which when granular-entry-heal is enabled, expects
+    granular indices, the lack of which can lead to loss of data in
+    the worst case.
+    
+    Change-Id: Ibc0fbfb3fa21c578e28868d9e30b274e33c12064
+    BUG: 1403646
+    Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
+    Reviewed-on: http://review.gluster.org/16105

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