diff --git a/CHANGELOG b/CHANGELOG
index 413ba65..333e753 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,23 @@
 ChangeLog :
 ===========
 
+2016/05/10 : 1.5.18
+    - DOC: Clarify IPv4 address / mask notation rules
+    - CLEANUP: fix inconsistency between fd->iocb, proto->accept and accept()
+    - BUG/MEDIUM: fix maxaccept computation on per-process listeners
+    - BUG/MINOR: listener: stop unbound listeners on startup
+    - BUG/MINOR: fix maxaccept computation according to the frontend process range
+    - MEDIUM: unblock signals on startup.
+    - BUG/MEDIUM: channel: don't allow to overwrite the reserve until connected
+    - BUG/MEDIUM: channel: incorrect polling condition may delay event delivery
+    - BUG/MEDIUM: channel: fix miscalculation of available buffer space (3rd try)
+    - MINOR: channel: add new function channel_congested()
+    - BUG/MEDIUM: http: fix risk of CPU spikes with pipelined requests from dead client
+    - BUG/MAJOR: channel: fix miscalculation of available buffer space (4th try)
+    - BUG/MEDIUM: stream: ensure the SI_FL_DONT_WAKE flag is properly cleared
+    - BUG/MEDIUM: channel: fix inconsistent handling of 4GB-1 transfers
+    - MINOR: stats: fix typo in help messages
+
 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
diff --git a/README b/README
index ed1f350..4674d54 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@
                          ----------------------
                                version 1.5
                              willy tarreau
-                               2016/04/13
+                               2016/05/10
 
 
 1) How to build it
diff --git a/VERDATE b/VERDATE
index 6b476e4..97c7202 100644
--- a/VERDATE
+++ b/VERDATE
@@ -1,2 +1,2 @@
 $Format:%ci$
-2016/04/13
+2016/05/10
diff --git a/VERSION b/VERSION
index 26c185e..83d4cf8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.17
+1.5.18
diff --git a/doc/configuration.txt b/doc/configuration.txt
index 38c7555..c4b1333 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -4,7 +4,7 @@
                          ----------------------
                                version 1.5
                              willy tarreau
-                               2016/04/13
+                               2016/05/10
 
 
 This document covers the configuration language as implemented in the version
diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index 2bd1ffd..936cc86 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.17
+Version: 1.5.18
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -76,6 +76,9 @@
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
 
 %changelog
+* Tue May 10 2016 Willy Tarreau <w@1wt.eu>
+- updated to 1.5.18
+
 * Wed Apr 13 2016 Willy Tarreau <w@1wt.eu>
 - updated to 1.5.17