diff --git a/CHANGELOG b/CHANGELOG
index 25a6f0c..7ad31cc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,46 @@
 ChangeLog :
 ===========
 
+2019/12/11 : 2.0.11
+    - BUG/MINOR: stream: init variables when the list is empty
+    - BUG/MINOR: contrib/prometheus-exporter: Use HTX errors and not legacy ones
+    - BUG/MINOR: contrib/prometheus-exporter: decode parameter and value only
+    - BUG/MINOR: http-htx: Don't make http_find_header() fail if the value is empty
+    - DOC: Clarify behavior of server maxconn in HTTP mode
+    - DOC: clarify matching strings on binary fetches
+    - DOC: move the "group" keyword at the right place
+    - BUG/MEDIUM: stream-int: don't subscribed for recv when we're trying to flush data
+    - BUG/MINOR: stream-int: avoid calling rcv_buf() when splicing is still possible
+    - BUG/MEDIUM: listener/thread: fix a race when pausing a listener
+    - BUG/MINOR: ssl: certificate choice can be unexpected with openssl >= 1.1.1
+    - BUG/MEDIUM: mux-h1: Never reuse H1 connection if a shutw is pending
+    - BUG/MINOR: mux-h1: Don't rely on CO_FL_SOCK_RD_SH to set H1C_F_CS_SHUTDOWN
+    - BUG/MINOR: mux-h1: Fix conditions to know whether or not we may receive data
+    - BUG/MEDIUM: tasks: Make sure we switch wait queues in task_set_affinity().
+    - BUG/MEDIUM: checks: Make sure we set the task affinity just before connecting.
+    - BUG/MINOR: mux-h1: Be sure to set CS_FL_WANT_ROOM when EOM can't be added
+    - BUG/MINOR: proxy: make soft_stop() also close FDs in LI_PAUSED state
+    - BUG/MINOR: listener/threads: always use atomic ops to clear the FD events
+    - BUG/MINOR: listener: also clear the error flag on a paused listener
+    - BUG/MEDIUM: listener/threads: fix a remaining race in the listener's accept()
+    - DOC: document the listener state transitions
+    - BUG/MAJOR: dns: add minimalist error processing on the Rx path
+    - BUG/MEDIUM: proto_udp/threads: recv() and send() must not be exclusive.
+    - BUG/MEDIUM: kqueue: Make sure we report read events even when no data.
+    - DOC: listeners: add a few missing transitions
+    - BUG/MINOR: tasks: only requeue a task if it was already in the queue
+    - DOC: proxies: HAProxy only supports 3 connection modes
+    - BUILD/MINOR: ssl: shut up a build warning about format truncation
+    - BUILD/MINOR: tools: shut up the format truncation warning in get_gmt_offset()
+    - BUILD: do not disable -Wformat-truncation anymore
+    - DOC: remove references to the outdated architecture.txt
+    - BUG/MINOR: log: fix minor resource leaks on logformat error path
+    - BUG/MINOR: mworker: properly pass SIGTTOU/SIGTTIN to workers
+    - BUG/MINOR: listener: do not immediately resume on transient error
+    - BUG/MINOR: server: make "agent-addr" work on default-server line
+    - BUG/MINOR: listener: fix off-by-one in state name check
+    - BUILD/MINOR: unix sockets: silence an absurd gcc warning about strncpy()
+
 2019/11/25 : 2.0.10
     - BUG/MINOR: init: fix set-dumpable when using uid/gid
     - MINOR: peers: Alway show the table info for disconnected peers.
diff --git a/VERDATE b/VERDATE
index 2deb4e6..35ae6c2 100644
--- a/VERDATE
+++ b/VERDATE
@@ -1,2 +1,2 @@
 $Format:%ci$
-2019/11/25
+2019/12/11
diff --git a/VERSION b/VERSION
index 0a69206..6cbacdc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.10
+2.0.11
diff --git a/doc/configuration.txt b/doc/configuration.txt
index 06239a2..e8d89d4 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -4,7 +4,7 @@
                          ----------------------
                               version 2.0
                              willy tarreau
-                              2019/11/25
+                              2019/12/11
 
 
 This document covers the configuration language as implemented in the version
diff --git a/doc/internals/listener-states.fig b/doc/internals/listener-states.fig
index c2acc91..1f78203 100644
--- a/doc/internals/listener-states.fig
+++ b/doc/internals/listener-states.fig
@@ -1,4 +1,4 @@
-#FIG 3.2  Produced by xfig version 3.2.7a
+#FIG 3.2  Produced by xfig version 2.0
 Portrait
 Center
 Metric