diff --git a/ChangeLog b/ChangeLog
index 3b1c493..92d1b59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,99352 @@
-ChangeLog is maintained by "git log".
+commit 6a0faa1ff1f21ee9c9ceb6f2ca46d548ce15986d
+Author: Niels de Vos <ndevos@redhat.com>
+Date:   Tue Sep 15 15:59:32 2015 +0200
+
+    doc: release notes for GlusterFS 3.5.6
+    
+    BUG: 1240783
+    Change-Id: I259f4d24ab5e7826ea304be9759f54b461853621
+    Signed-off-by: Niels de Vos <ndevos@redhat.com>
+    Reviewed-on: http://review.gluster.org/12183
+
+commit 8f2c7e67a8fa9cbf9f3b62ab0de930d921e3d362
+Author: Niels de Vos <ndevos@redhat.com>
+Date:   Fri Jul 17 12:09:55 2015 +0200
+
+    build: drop incorrect usage of 'inline'
+    
+    Newer versions of gcc complain loudly about the incorrect usage of
+    'inline'.
+    
+    These changes have been part of commit a3cb38e3 in other branches. There
+    is no need to backport everything from that commit, but silencing the
+    warnings would be good.
+    
+    Change-Id: I2319d9682b47e8533e9c179056a5152f75aeddc3
+    BUG: 1244147
+    Signed-off-by: Niels de Vos <ndevos@redhat.com>
+    Reviewed-on: http://review.gluster.org/11711
+    Tested-by: Gluster Build System <jenkins@build.gluster.com>
+    Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
+
+commit 4703fc724a5b5070fa0fce5204015faaf38858f1
+Author: Niels de Vos <ndevos@redhat.com>
+Date:   Fri Jul 17 10:39:02 2015 +0200
+
+    nfs: a unix-domain-socket should not be created as fifo
+    
+    Cherry picked from commit 381afd4f480533f212e1f62a0ccfd9dcf7248e17:
+    > Change-Id: Ic6a23165df1703b330636a059967c3c674dbde57
+    > BUG: 1235231
+    > Signed-off-by: Niels de Vos <ndevos@redhat.com>
+    > Reviewed-on: http://review.gluster.org/11355
+    > Tested-by: NetBSD Build System <jenkins@build.gluster.org>
+    > Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>

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