diff --git a/ChangeLog b/ChangeLog
index 3b1c493..4de126d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,117196 @@
-ChangeLog is maintained by "git log".
+commit b19a1d0798aef65c07171492f7e3faaf3af6fed3
+Author: Atin Mukherjee <amukherj@redhat.com>
+Date:   Thu Nov 19 12:00:23 2015 +0530
+
+    core : Use correct path in dlopen for socket.so
+    
+    Backport of http://review.gluster.org/12656
+    
+    This patch fixes the path for socket.so file while loading the so dynamically.
+    Also for config.memory-accounting & config.transport voltype is changed to
+    glusterd to fix the warning message coming from xlator_volopt_dynload
+    
+    Change-Id: I0f7964814586f2018d4922b23c683f4e1eb3098e
+    BUG: 1283834
+    Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
+    Reviewed-on: http://review.gluster.org/12656
+    Tested-by: Gluster Build System <jenkins@build.gluster.com>
+    Reviewed-by: Niels de Vos <ndevos@redhat.com>
+    Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
+    Reviewed-on: http://review.gluster.org/12671
+    Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>
+
+commit b55959c5909b3c32aca18f0c77eced134b38db56
+Author: Niels de Vos <ndevos@redhat.com>
+Date:   Wed Dec 2 21:19:56 2015 +0100
+
+    fuse: pass default SElinux mount options on to the kernel
+    
+    In order to set default SElinux contexts on a Gluster mount, the
+    standard SElinux mount options need to be passed to the kernel. The
+    mount(8) manual page lists "context", "fscontext", "defcontext" and
+    "rootcontext" as valid options.
+    
+            Backport of http://review.gluster.org/#/c/12858/
+    
+    Cherry-picked from commit 5e81233f0a3c153e03c437a164ac2ca21314bdec
+    > BUG: 1287763
+    > Change-Id: I015fe27e4c6ff36a030e3480b23141aca2d91fc2
+    > Signed-off-by: Niels de Vos <ndevos@redhat.com>
+    > Reviewed-on: http://review.gluster.org/12858
+    > Tested-by: NetBSD Build System <jenkins@build.gluster.org>
+    > Tested-by: Gluster Build System <jenkins@build.gluster.com>
+    > Reviewed-by: Humble Devassy Chirammal <humble.devassy@gmail.com>
+    > Reviewed-by: Manikandan Selvaganesh <mselvaga@redhat.com>

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