diff --git a/CHANGELOG b/CHANGELOG
index 2ad97b8..701bbf8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,28 @@
 ChangeLog :
 ===========
 
+2019/09/27 : 2.0.7
+    - BUG/MEDIUM: stick-table: Properly handle "show table" with a data type argument
+    - BUG/MINOR: mux-h2: Be sure to have a connection to unsubcribe
+    - BUG/MAJOR: mux-h2: Handle HEADERS frames received after a RST_STREAM frame
+    - BUG/MEDIUM: check/threads: make external checks run exclusively on thread 1
+    - BUG/MINOR: stream-int: Process connection/CS errors first in si_cs_send()
+    - BUG/MEDIUM: stream-int: Process connection/CS errors during synchronous sends
+    - BUG/MEDIUM: checks: make sure the connection is ready before trying to recv
+    - BUG/MINOR: mux-h2: do not wake up blocked streams before the mux is ready
+    - BUG/MEDIUM: namespace: close open namespaces during soft shutdown
+    - BUG/MEDIUM: mux-h2: don't reject valid frames on closed streams
+    - BUG/MINOR: mux-h2: Use the dummy error when decoding headers for a closed stream
+    - BUG/MAJOR: mux_h2: Don't consume more payload than received for skipped frames
+    - BUG/MINOR: mux-h1: Do h2 upgrade only on the first request
+    - BUG/MEDIUM: spoe: Use a different engine-id per process
+    - MINOR: spoe: Improve generation of the engine-id
+    - MINOR: spoe: Support the async mode with several threads
+    - MINOR: stats: Add the support of float fields in stats
+    - BUG/MINOR: contrib/prometheus-exporter: Return the time averages in seconds
+    - DOC: Fix documentation about the cli command to get resolver stats
+    - BUG/MEDIUM: namespace: fix fd leak in master-worker mode
+
 2019/09/13 : 2.0.6
     - MINOR: debug: indicate the applet name when the task is task_run_applet()
     - MINOR: tools: add append_prefixed_str()
diff --git a/VERDATE b/VERDATE
index cd78a59..22a2ce2 100644
--- a/VERDATE
+++ b/VERDATE
@@ -1,2 +1,2 @@
 $Format:%ci$
-2019/09/13
+2019/09/27
diff --git a/VERSION b/VERSION
index 157e54f..f1547e6 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.6
+2.0.7
diff --git a/doc/configuration.txt b/doc/configuration.txt
index b6b3b4d..be8bb3f 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -4,7 +4,7 @@
                          ----------------------
                               version 2.0
                              willy tarreau
-                              2019/09/13
+                              2019/09/27
 
 
 This document covers the configuration language as implemented in the version