diff --git a/CHANGELOG b/CHANGELOG
index 418dada..167370e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,17 @@
 ChangeLog :
 ===========
 
+2014/10/30 : 1.5.7
+    - BUG/MEDIUM: regex: fix pcre_study error handling
+    - BUG/MINOR: log: fix request flags when keep-alive is enabled
+    - MINOR: ssl: add fetchs 'ssl_c_der' and 'ssl_f_der' to return DER formatted certs
+    - MINOR: ssl: add statement to force some ssl options in global.
+    - BUG/MINOR: ssl: correctly initialize ssl ctx for invalid certificates
+    - BUG/MEDIUM: http: don't dump debug headers on MSG_ERROR
+    - BUG/MAJOR: cli: explicitly call cli_release_handler() upon error
+    - BUG/MEDIUM: tcp: fix outgoing polling based on proxy protocol
+    - BUG/MEDIUM: tcp: don't use SO_ORIGINAL_DST on non-AF_INET sockets
+
 2014/10/18 : 1.5.6
     - BUG/MEDIUM: systemd: set KillMode to 'mixed'
     - MINOR: systemd: Check configuration before start
diff --git a/README b/README
index d111b43..b58df1e 100644
--- a/README
+++ b/README
@@ -1,9 +1,9 @@
                          ----------------------
                              HAProxy how-to
                          ----------------------
-                             version 1.5.6
+                             version 1.5.7
                              willy tarreau
-                               2014/10/18
+                               2014/10/30
 
 
 1) How to build it
diff --git a/VERDATE b/VERDATE
index 4fa775a..6e1a526 100644
--- a/VERDATE
+++ b/VERDATE
@@ -1,2 +1,2 @@
 $Format:%ci$
-2014/10/18
+2014/10/30
diff --git a/VERSION b/VERSION
index eac1e0a..f01291b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.6
+1.5.7
diff --git a/doc/configuration.txt b/doc/configuration.txt
index e29d655..fe8300f 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -2,9 +2,9 @@
                                 HAProxy
                           Configuration Manual
                          ----------------------
-                             version 1.5.6
+                             version 1.5.7
                              willy tarreau
-                              2014/10/18
+                              2014/10/30
 
 
 This document covers the configuration language as implemented in the version
diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index df6169e..6e96ced 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.6
+Version: 1.5.7
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -76,6 +76,9 @@
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
 
 %changelog
+* Thu Oct 30 2014 Willy Tarreau <w@1wt.eu>
+- updated to 1.5.7
+
 * Sat Oct 18 2014 Willy Tarreau <w@1wt.eu>
 - updated to 1.5.6