diff --git a/CHANGELOG b/CHANGELOG
index 05b6bf33c..5b6d2a268 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,18 @@
 ChangeLog :
 ===========
 
+2009/03/08 : 1.3.15.8
+    - [BUG] Fix listen & more of 2 couples <ip>:<port>
+    - [DOC] remove buggy comment for use_backend
+    - [CRITICAL] fix server state tracking: it was O(n!) instead of O(n)
+    - [BUG] "option transparent" is for backend, not frontend !
+    - [BUG] we must not exit if protocol binding only returns a warning
+    - [BUG] inform the user when root is expected but not set
+    - [DOC] large doc update backported from mainline
+    - [BUG] the "source" keyword must first clear optional settings
+    - [BUG] global.tune.maxaccept must be limited even in mono-process mode
+    - [BUG] typo in timeout error reporting : report *res and not *err
+
 2008/12/04 : 1.3.15.7
     - [BUILD] fix MANDIR default location to match documentation
     - [BUG] critical errors should be reported even in daemon mode
diff --git a/VERDATE b/VERDATE
index 0a2fab223..c9442b8ae 100644
--- a/VERDATE
+++ b/VERDATE
@@ -1 +1 @@
-2008/12/04
+2009/03/08
diff --git a/VERSION b/VERSION
index 6f2d67581..e93a5b07d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.15.7
+1.3.15.8
diff --git a/doc/configuration.txt b/doc/configuration.txt
index 72fc3878e..5be9d0153 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -2,9 +2,9 @@
                                  HAProxy
                           Configuration Manual
                          ----------------------
-                            version 1.3.15.2
+                            version 1.3.15.8
                              willy tarreau
-                              2008/06/21
+                              2009/03/08
 
 
 This document covers the configuration language as implemented in the version
diff --git a/examples/haproxy-small.spec b/examples/haproxy-small.spec
index ba268c27b..801890a3d 100644
--- a/examples/haproxy-small.spec
+++ b/examples/haproxy-small.spec
@@ -1,6 +1,6 @@
 Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 Name: haproxy
-Version: 1.3.15.7
+Version: 1.3.15.8
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -69,6 +69,9 @@ fi
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
 
 %changelog
+* Sun Mar 08 2009 Willy Tarreau <w@1wt.eu>
+- updated to 1.3.15.8
+
 * Thu Dec 04 2008 Willy Tarreau <w@1wt.eu>
 - updated to 1.3.15.7
 
diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index 044c10b9b..1d7e3ea77 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.3.15.7
+Version: 1.3.15.8
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -71,6 +71,9 @@ fi
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
 
 %changelog
+* Sun Mar 08 2009 Willy Tarreau <w@1wt.eu>
+- updated to 1.3.15.8
+
 * Thu Dec 04 2008 Willy Tarreau <w@1wt.eu>
 - updated to 1.3.15.7