diff --git a/CHANGELOG b/CHANGELOG
index af54911..e9d0791 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,19 @@
 ChangeLog :
 ===========
 
+2006/05/13 : 1.2.13
+   - 'maxconn' server parameter to do per-server session limitation
+   - queueing to support non-blocking session limitation
+   - fixed removal of cookies for cookie-less servers such as backup servers
+   - two separate wait queues for expirable and non-expirable tasks provide
+     better performance with lots of sessions.
+   - some code cleanups and performance improvements
+   - made state dumps a bit more verbose
+   - fixed missing checks for NULL srv in dispatch mode
+   - load balancing on backup servers was not possible in source hash mode.
+   - two session flags shared the same bit, but fortunately they were not
+     compatible.
+
 2006/04/15 : 1.2.12
    Very few changes preparing for more important changes to support per-server
    session limitations and queueing :
diff --git a/Makefile b/Makefile
index 71ceeee..40f135f 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # You should use it this way :
 #   make TARGET=os CPU=cpu
 
-VERSION := 1.2.12
+VERSION := 1.2.13
 
 # Select target OS. TARGET must match a system for which COPTS and LIBS are
 # correctly defined below.
diff --git a/examples/haproxy-small.spec b/examples/haproxy-small.spec
index 77ca08f..18db2b4 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.2.12
+Version: 1.2.13
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -69,6 +69,9 @@
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
 
 %changelog
+* Wed May 01 2006 Willy Tarreau <willy@w.ods.org>
+- updated to 1.2.13
+
 * Wed Apr 15 2006 Willy Tarreau <willy@w.ods.org>
 - updated to 1.2.12
 
diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index 6e8658b..3617f7a 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.2.12
+Version: 1.2.13
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -71,6 +71,9 @@
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
 
 %changelog
+* Wed May 01 2006 Willy Tarreau <willy@w.ods.org>
+- updated to 1.2.13
+
 * Wed Apr 15 2006 Willy Tarreau <willy@w.ods.org>
 - updated to 1.2.12
 
diff --git a/haproxy.c b/haproxy.c
index cc317b7..66deec9 100644
--- a/haproxy.c
+++ b/haproxy.c
@@ -89,11 +89,11 @@
 #include "include/mini-clist.h"
 
 #ifndef HAPROXY_VERSION
-#define HAPROXY_VERSION "1.2.12"
+#define HAPROXY_VERSION "1.2.13"
 #endif
 
 #ifndef HAPROXY_DATE
-#define HAPROXY_DATE	"2006/04/15"
+#define HAPROXY_DATE	"2006/05/13"
 #endif
 
 /* this is for libc5 for example */