diff --git a/CHANGELOG b/CHANGELOG
index a206ebf43..c04b49ae9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,27 @@
 ChangeLog :
 ===========
 
+2009/10/12 : 1.3.21
+    - [DOC] add missing rate_lim and rate_max
+    - [BUG] check if rise/fall has an argument and it is > 0
+    - [MINOR] add "description", "node" and show-node"/"show-desc", remove "node-name", v2
+    - [DOC] Add information about http://haproxy.1wt.eu/contrib.html
+    - [MINOR] acl: don't report valid acls as potential mistakes
+    - [BUG] task.c: don't assing last_timer to node-less entries
+    - [MINOR] export the hostname variable so that all the code can access it
+    - [MINOR] stats: add a new node-name setting
+    - [MINOR] acl: add support for hdr_ip to match IP addresses in headers
+    - [CLEANUP] remove ifdef MSG_NOSIGNAL and define it instead
+    - [BUG] buffer_forward() would not correctly consider data already scheduled
+    - [MAJOR] http: add support for HTTP 1xx informational responses
+    - [BUILD] stream_interface: fix conflicting declaration
+    - [CLEANUP] include time.h from freq_ctr.h as it uses "now".
+    - [MINOR] report list of supported pollers with -vv
+    - [MEDIUM] new option "independant-streams" to stop updating read timeout on writes
+    - [BUG] don't refresh timeouts late after detected activity
+    - [MINOR] acl: add fe_conn, be_conn, queue, avg_queue
+    - [BUILD] add a 'make tags' target (cherry picked from commit ebe0af4b77bca2042565a3f15fc1f597f5862874)
+
 2009/08/09 : 1.3.20
     - [BUG] task: fix possible crash when some timeouts are not configured
     - [BUG] log: option tcplog would log to global if no logger was defined
diff --git a/VERDATE b/VERDATE
index 8600c6a68..7c402ee4b 100644
--- a/VERDATE
+++ b/VERDATE
@@ -1 +1 @@
-2009/08/09
+2009/10/12
diff --git a/VERSION b/VERSION
index 3c59b4047..89bdc0948 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.20
+1.3.21
diff --git a/doc/configuration.txt b/doc/configuration.txt
index 01ac841dc..37b351fce 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -2,9 +2,9 @@
                                  HAProxy
                           Configuration Manual
                          ----------------------
-                            version 1.3.19
+                            version 1.3.21
                              willy tarreau
-                              2009/07/27
+                              2009/10/12
 
 
 This document covers the configuration language as implemented in the version
diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index 71cd1aea6..9062df48c 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.20
+Version: 1.3.21
 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
+* Mon Oct 12 2009 Willy Tarreau <w@1wt.eu>
+- updated to 1.3.21
+
 * Sun Aug  9 2009 Willy Tarreau <w@1wt.eu>
 - updated to 1.3.20