diff --git a/CHANGELOG b/CHANGELOG
index e388c0b..cf88013 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,22 @@
 ChangeLog :
 ===========
 
+2014/09/02 : 1.5.4
+    - BUG: config: error in http-response replace-header number of arguments
+    - BUG/MINOR: Fix search for -p argument in systemd wrapper.
+    - BUG/MEDIUM: auth: fix segfault with http-auth and a configuration with an unknown encryption algorithm
+    - BUG/MEDIUM: config: userlists should ensure that encrypted passwords are supported
+    - MEDIUM: connection: add new bit in Proxy Protocol V2
+    - BUG/MINOR: server: move the directive #endif to the end of file
+    - BUG/MEDIUM: http: tarpit timeout is reset
+    - BUG/MAJOR: tcp: fix a possible busy spinning loop in content track-sc*
+    - BUG/MEDIUM: http: fix inverted condition in pat_match_meth()
+    - BUG/MEDIUM: http: fix improper parsing of HTTP methods for use with ACLs
+    - BUG/MINOR: pattern: remove useless allocation of unused trash in pat_parse_reg()
+    - BUG/MEDIUM: acl: correctly compute the output type when a converter is used
+    - CLEANUP: acl: cleanup some of the redundancy and spaghetti after last fix
+    - BUG/CRITICAL: http: don't update msg->sov once data start to leave the buffer
+
 2014/07/25 : 1.5.3
     - DOC: fix typo in Unix Socket commands
     - BUG/MEDIUM: connection: fix memory corruption when building a proxy v2 header
diff --git a/README b/README
index 66be507..4f3909a 100644
--- a/README
+++ b/README
@@ -1,9 +1,9 @@
                          ----------------------
                              HAProxy how-to
                          ----------------------
-                             version 1.5.3
+                             version 1.5.4
                              willy tarreau
-                               2014/07/25
+                               2014/09/02
 
 
 1) How to build it
diff --git a/VERDATE b/VERDATE
index 732ed21..22ebf1a 100644
--- a/VERDATE
+++ b/VERDATE
@@ -1,2 +1,2 @@
 $Format:%ci$
-2014/07/25
+2014/09/02
diff --git a/VERSION b/VERSION
index 8af85be..94fe62c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.3
+1.5.4
diff --git a/doc/configuration.txt b/doc/configuration.txt
index 44adf38..19df5ae 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -2,9 +2,9 @@
                                 HAProxy
                           Configuration Manual
                          ----------------------
-                             version 1.5.3
+                             version 1.5.4
                              willy tarreau
-                              2014/07/25
+                              2014/09/02
 
 
 This document covers the configuration language as implemented in the version
diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index 391a624..4b784aa 100644
--- a/examples/haproxy.spec
+++ b/examples/haproxy.spec
@@ -1,6 +1,6 @@
 Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 Name: haproxy
-Version: 1.5.3
+Version: 1.5.4
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -76,6 +76,9 @@
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
 
 %changelog
+* Tue Sep  2 2014 Willy Tarreau <w@1wt.eu>
+- updated to 1.5.4
+
 * Fri Jul 25 2014 Willy Tarreau <w@1wt.eu>
 - updated to 1.5.3