[RELEASE] Released version 1.5.17

Released version 1.5.17 with the following main changes :
    - BUG/MINOR: log: Don't use strftime() which can clobber timezone if chrooted
    - BUG/MINOR: conf: "listener id" expects integer, but its not checked
    - BUG/MAJOR: Fix crash in http_get_fhdr with exactly MAX_HDR_HISTORY headers
    - DOC: "addr" parameter applies to both health and agent checks
    - DOC: timeout client: pointers to timeout http-request
    - DOC: typo on stick-store response
    - DOC: typo: ACL subdir match
    - DOC: typo: maxconn paragraph is wrong due to a wrong buffer size
    - DOC: typo: req.uri is now replaced by capture.req.uri
    - DOC: fix "needed" typo
    - BUG/MINOR : allow to log cookie for tarpit and denied request
    - BUG/MAJOR: channel: fix miscalculation of available buffer space (2nd try)
    - DOC: fix discrepancy in the example for http-request redirect
diff --git a/CHANGELOG b/CHANGELOG
index e148ce2..413ba65 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,21 @@
 ChangeLog :
 ===========
 
+2016/04/13 : 1.5.17
+    - BUG/MINOR: log: Don't use strftime() which can clobber timezone if chrooted
+    - BUG/MINOR: conf: "listener id" expects integer, but its not checked
+    - BUG/MAJOR: Fix crash in http_get_fhdr with exactly MAX_HDR_HISTORY headers
+    - DOC: "addr" parameter applies to both health and agent checks
+    - DOC: timeout client: pointers to timeout http-request
+    - DOC: typo on stick-store response
+    - DOC: typo: ACL subdir match
+    - DOC: typo: maxconn paragraph is wrong due to a wrong buffer size
+    - DOC: typo: req.uri is now replaced by capture.req.uri
+    - DOC: fix "needed" typo
+    - BUG/MINOR : allow to log cookie for tarpit and denied request
+    - BUG/MAJOR: channel: fix miscalculation of available buffer space (2nd try)
+    - DOC: fix discrepancy in the example for http-request redirect
+
 2016/03/14 : 1.5.16
     - BUG/BUILD: replace haproxy-systemd-wrapper with $(EXTRA) in install-bin.
     - BUG/MINOR: acl: don't use record layer in req_ssl_ver
diff --git a/README b/README
index e6ab8ba..ed1f350 100644
--- a/README
+++ b/README
@@ -1,9 +1,9 @@
                          ----------------------
                              HAProxy how-to
                          ----------------------
-                             version 1.5.16
+                               version 1.5
                              willy tarreau
-                               2016/03/13
+                               2016/04/13
 
 
 1) How to build it
diff --git a/VERDATE b/VERDATE
index 72f0e3c..6b476e4 100644
--- a/VERDATE
+++ b/VERDATE
@@ -1,2 +1,2 @@
 $Format:%ci$
-2016/03/14
+2016/04/13
diff --git a/VERSION b/VERSION
index 0ed0610..26c185e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.16
+1.5.17
diff --git a/doc/configuration.txt b/doc/configuration.txt
index 26b1f0e..6c7c33c 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -2,9 +2,9 @@
                                 HAProxy
                           Configuration Manual
                          ----------------------
-                             version 1.5.16
+                               version 1.5
                              willy tarreau
-                               2016/03/13
+                               2016/04/13
 
 
 This document covers the configuration language as implemented in the version
diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index ca3d73a..2bd1ffd 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.16
+Version: 1.5.17
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -76,6 +76,9 @@
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
 
 %changelog
+* Wed Apr 13 2016 Willy Tarreau <w@1wt.eu>
+- updated to 1.5.17
+
 * Mon Mar 14 2016 Willy Tarreau <w@1wt.eu>
 - updated to 1.5.16
 
diff --git a/src/haproxy.c b/src/haproxy.c
index b665166..862697d 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1,6 +1,6 @@
 /*
  * HA-Proxy : High Availability-enabled HTTP/TCP proxy
- * Copyright 2000-2016  Willy Tarreau <w@1wt.eu>.
+ * Copyright 2000-2016 Willy Tarreau <willy@haproxy.org>.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License