diff --git a/CHANGELOG b/CHANGELOG
index 167370e..5c45b7e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
 ChangeLog :
 ===========
 
+2014/10/31 : 1.5.8
+    - BUG/MAJOR: buffer: check the space left is enough or not when input data in a buffer is wrapped
+    - BUG/BUILD: revert accidental change in the makefile from latest SSL fix
+
 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
diff --git a/README b/README
index b58df1e..2dd8e83 100644
--- a/README
+++ b/README
@@ -1,9 +1,9 @@
                          ----------------------
                              HAProxy how-to
                          ----------------------
-                             version 1.5.7
+                             version 1.5.8
                              willy tarreau
-                               2014/10/30
+                               2014/10/31
 
 
 1) How to build it
diff --git a/VERDATE b/VERDATE
index 6e1a526..3953fe5 100644
--- a/VERDATE
+++ b/VERDATE
@@ -1,2 +1,2 @@
 $Format:%ci$
-2014/10/30
+2014/10/31
diff --git a/VERSION b/VERSION
index f01291b..1cc9c18 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.7
+1.5.8
diff --git a/doc/configuration.txt b/doc/configuration.txt
index fe8300f..7c4e18b 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -2,9 +2,9 @@
                                 HAProxy
                           Configuration Manual
                          ----------------------
-                             version 1.5.7
+                             version 1.5.8
                              willy tarreau
-                              2014/10/30
+                              2014/10/31
 
 
 This document covers the configuration language as implemented in the version
diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index 6e96ced..b39e780 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.7
+Version: 1.5.8
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -76,6 +76,9 @@
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
 
 %changelog
+* Fri Oct 31 2014 Willy Tarreau <w@1wt.eu>
+- updated to 1.5.8
+
 * Thu Oct 30 2014 Willy Tarreau <w@1wt.eu>
 - updated to 1.5.7