diff --git a/CHANGELOG b/CHANGELOG
index cf88013..8fcb52d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,30 @@
 ChangeLog :
 ===========
 
+2014/10/08 : 1.5.5
+    - DOC: Address issue where documentation is excluded due to a gitignore rule.
+    - MEDIUM: Improve signal handling in systemd wrapper.
+    - BUG/MINOR: config: don't propagate process binding for dynamic use_backend
+    - MINOR: Also accept SIGHUP/SIGTERM in systemd-wrapper
+    - DOC: clearly state that the "show sess" output format is not fixed
+    - MINOR: stats: fix minor typo fix in stats_dump_errors_to_buffer()
+    - DOC: indicate in the doc that track-sc* can wait if data are missing
+    - MEDIUM: http: enable header manipulation for 101 responses
+    - BUG/MEDIUM: config: propagate frontend to backend process binding again.
+    - MEDIUM: config: properly propagate process binding between proxies
+    - MEDIUM: config: make the frontends automatically bind to the listeners' processes
+    - MEDIUM: config: compute the exact bind-process before listener's maxaccept
+    - MEDIUM: config: only warn if stats are attached to multi-process bind directives
+    - MEDIUM: config: report it when tcp-request rules are misplaced
+    - MINOR: config: detect the case where a tcp-request content rule has no inspect-delay
+    - MEDIUM: systemd-wrapper: support multiple executable versions and names
+    - BUG/MEDIUM: remove debugging code from systemd-wrapper
+    - BUG/MEDIUM: http: adjust close mode when switching to backend
+    - BUG/MINOR: config: don't propagate process binding on fatal errors.
+    - BUG/MEDIUM: check: rule-less tcp-check must detect connect failures
+    - BUG/MINOR: tcp-check: report the correct failed step in the status
+    - DOC: indicate that weight zero is reported as DRAIN
+
 2014/09/02 : 1.5.4
     - BUG: config: error in http-response replace-header number of arguments
     - BUG/MINOR: Fix search for -p argument in systemd wrapper.
diff --git a/VERDATE b/VERDATE
index 22ebf1a..3442495 100644
--- a/VERDATE
+++ b/VERDATE
@@ -1,2 +1,2 @@
 $Format:%ci$
-2014/09/02
+2014/10/07
diff --git a/VERSION b/VERSION
index 94fe62c..9075be4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.4
+1.5.5
diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index 4b784aa..f59c45f 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.4
+Version: 1.5.5
 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 Oct  8 2014 Willy Tarreau <w@1wt.eu>
+- updated to 1.5.5
+
 * Tue Sep  2 2014 Willy Tarreau <w@1wt.eu>
 - updated to 1.5.4