diff --git a/CHANGELOG b/CHANGELOG
index e64f33959..733589822 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,18 @@
 ChangeLog :
 ===========
 
+2013/12/17 : 1.5-dev21
+    - MINOR: stats: don't use a monospace font to report numbers
+    - MINOR: session: remove debugging code
+    - BUG/MAJOR: patterns: fix double free caused by loading strings from files
+    - MEDIUM: http: make option http_proxy automatically rewrite the URL
+    - BUG/MEDIUM: http: cook_cnt() forgets to set its output type
+    - BUG/MINOR: stats: correctly report throttle rate of low weight servers
+    - BUG/MEDIUM: checks: servers must not start in slowstart mode
+    - BUG/MINOR: acl: parser must also stop at comma on ACL-only keywords
+    - MEDIUM: stream-int: implement a very simplistic idle connection manager
+    - DOC: update the ROADMAP file
+
 2013/12/16 : 1.5-dev20
     - DOC: add missing options to the manpage
     - DOC: add manpage references to all system calls
diff --git a/README b/README
index 5c084130c..6641f7bdf 100644
--- a/README
+++ b/README
@@ -1,9 +1,9 @@
                          ----------------------
                              HAProxy how-to
                          ----------------------
-                            version 1.5-dev20
+                            version 1.5-dev21
                              willy tarreau
-                               2013/12/16
+                               2013/12/17
 
 
 1) How to build it
diff --git a/VERDATE b/VERDATE
index 48a936e68..4ddbe043e 100644
--- a/VERDATE
+++ b/VERDATE
@@ -1 +1,2 @@
-2013/12/16
++$Format:%ci$
+2013/12/17
diff --git a/VERSION b/VERSION
index cd2d5d6e7..6c116a88c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5-dev20
+1.5-dev21
diff --git a/doc/configuration.txt b/doc/configuration.txt
index ae7bc1a35..54005155f 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -4,7 +4,7 @@
                          ----------------------
                              version 1.5
                              willy tarreau
-                              2013/12/16
+                              2013/12/17
 
 
 This document covers the configuration language as implemented in the version
diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index 4f9184f41..f2811f9f5 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-dev20
+Version: 1.5-dev21
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -76,6 +76,9 @@ fi
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
 
 %changelog
+* Tue Dec 17 2013 Willy Tarreau <w@1wt.eu>
+- updated to 1.5-dev21
+
 * Mon Dec 16 2013 Willy Tarreau <w@1wt.eu>
 - updated to 1.5-dev20