diff --git a/ChangeLog b/ChangeLog
index 3b1c493..b4601cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,99075 @@
-ChangeLog is maintained by "git log".
+commit 55bd875f0bf9edc92e42c4822c929fb0ace77086
+Author: Niels de Vos <ndevos@redhat.com>
+Date:   Wed Jun 3 22:30:43 2015 +0200
+
+    doc: release notes for GlusterFS 3.5.4
+    
+    BUG: 1141158
+    Change-Id: Ia1778a789ca1d9a76bdf3aea4976009700551109
+    Signed-off-by: Niels de Vos <ndevos@redhat.com>
+
+commit 86487dfb7f51f552bb27a16568a612f14221cd49
+Author: Niels de Vos <ndevos@redhat.com>
+Date:   Wed May 20 22:34:44 2015 +0200
+
+    fuse: squash 64-bit inodes in readdirp when enable-ino32 is set
+    
+    The structures returned by readdirp contain the inode 2x. Only one of
+    them was squashed into 32-bits when enable-ino32 is enabled.
+    
+    Backport of:
+    > Change-Id: I33a6d28fb118bb23971f918ffeb983d7f033106e
+    > BUG: 1223889
+    > Reviewed-on: http://review.gluster.org/10881
+    > Signed-off-by: Niels de Vos <ndevos@redhat.com>
+    > Tested-by: Cyril Peponnet <cyril@peponnet.fr> [on release-3.5]
+    
+    Change-Id: I33a6d28fb118bb23971f918ffeb983d7f033106e
+    BUG: 1222150
+    Signed-off-by: Niels de Vos <ndevos@redhat.com>
+    Tested-by: Cyril Peponnet <cyril@peponnet.fr>
+    Reviewed-on: http://review.gluster.org/10884
+    Tested-by: Gluster Build System <jenkins@build.gluster.com>
+
+commit bfce25666d8a0d198292df4884d7d8d56ec0dc8c
+Author: Niels de Vos <ndevos@redhat.com>
+Date:   Thu Apr 16 17:46:49 2015 +0530
+
+    build: correct the version in glusterfs-api.pc
+    
+    The version in glusterfs-api.pc has moved backwards, breaking existing
+    versioned dependencies in QEMU. The following table contains the
+    GlusterFS version and the version for glusterfs-api.pc:
+    
+        .------------------------.

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