diff --git a/CHANGELOG b/CHANGELOG
index f5134ea..61c8224 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,12 @@
 ChangeLog :
 ===========
 
+2011/04/08 : 1.5-dev6
+    - [BUG] stream_sock: use get_addr_len() instead of sizeof() on sockaddr_storage
+    - [BUG] TCP source tracking was broken with IPv6 changes
+    - [BUG] stick-tables did not work when converting IPv6 to IPv4
+    - [CRITICAL] fix risk of crash when dealing with space in response cookies
+
 2011/03/29 : 1.5-dev5
     - [BUG] standard: is_addr return value for IPv4 was inverted
     - [MINOR] update comment about IPv6 support for server
diff --git a/VERDATE b/VERDATE
index 641cf86..d458e79 100644
--- a/VERDATE
+++ b/VERDATE
@@ -1 +1 @@
-2011/03/29
+2011/04/08
diff --git a/VERSION b/VERSION
index 6587f9f..465bd7c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5-dev5
+1.5-dev6
diff --git a/doc/configuration.txt b/doc/configuration.txt
index 7e67997..5285e68 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -4,7 +4,7 @@
                          ----------------------
                              version 1.5
                              willy tarreau
-                              2011/03/29
+                              2011/04/08
 
 
 This document covers the configuration language as implemented in the version
diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index acb1e02..bfbc1bd 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-dev5
+Version: 1.5-dev6
 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 Apr  8 2011 Willy Tarreau <w@1wt.eu>
+- updated to 1.5-dev6
+
 * Tue Mar 29 2011 Willy Tarreau <w@1wt.eu>
 - updated to 1.5-dev5