diff --git a/CHANGELOG b/CHANGELOG
index 90c410582..16d3865e6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,22 @@
 ChangeLog :
 ===========
 
+2009/03/29 : 1.3.17
+    - Update specfile to build for v2.6 kernel.
+    - [BUG] reset the stream_interface connect timeout upon connect or error
+    - [BUG] reject unix accepts when connection limit is reached
+    - [MINOR] show sess: report number of calls to each task
+    - [BUG] don't call epoll_ctl() on closed sockets
+    - [BUG] stream_sock: disable I/O on fds reporting an error
+    - [MINOR] sepoll: don't count two events on the same FD.
+    - [MINOR] show sess: report a lot more information about sessions
+    - [BUG] stream_sock: check for shut{r,w} before refreshing some timeouts
+    - [BUG] don't set an expiration date directly from now_ms
+    - [MINOR] implement ulltoh() to write HTML-formatted numbers
+    - [MINOR] stats/html: group digits by 3 to clarify numbers
+    - [BUILD] remove haproxy-small.spec
+    - [BUILD] makefile: remove unused references to linux24eold and EPOLL_CTL_WORKAROUND
+
 2009/03/22 : 1.3.16
     - [BUILD] Fixed Makefile for linking pcre
     - [CONTRIB] selinux policy for haproxy
diff --git a/VERDATE b/VERDATE
index 42b6cb03e..bcc33ba71 100644
--- a/VERDATE
+++ b/VERDATE
@@ -1 +1 @@
-2009/03/22
+2009/03/29
diff --git a/VERSION b/VERSION
index 25b22e060..ef40e4d0f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.16
+1.3.17
diff --git a/doc/configuration.txt b/doc/configuration.txt
index 4d58d8527..68f946d00 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -2,9 +2,9 @@
                                  HAProxy
                           Configuration Manual
                          ----------------------
-                            version 1.3.16
+                            version 1.3.17
                              willy tarreau
-                              2009/03/22
+                              2009/03/29
 
 
 This document covers the configuration language as implemented in the version
diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index 54b6a8530..e25b3eef5 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.16
+Version: 1.3.17
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -74,6 +74,9 @@ fi
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
 
 %changelog
+* Sun Mar 29 2009 Willy Tarreau <w@1wt.eu>
+- updated to 1.3.17
+
 * Sun Mar 22 2009 Willy Tarreau <w@1wt.eu>
 - updated to 1.3.16