diff --git a/CHANGELOG b/CHANGELOG
index 7ad31cc..23e95e1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,21 @@
 ChangeLog :
 ===========
 
+2019/12/21 : 2.0.12
+    - DOC: Improve documentation of http-re(quest|sponse) replace-(header|value|uri)
+    - DOC: clarify the fact that replace-uri works on a full URI
+    - BUG/MINOR: sample: fix the closing bracket and LF in the debug converter
+    - BUG/MINOR: sample: always check converters' arguments
+    - BUG/MEDIUM: ssl: Don't set the max early data we can receive too early.
+    - MINOR: task: only check TASK_WOKEN_ANY to decide to requeue a task
+    - BUG/MAJOR: task: add a new TASK_SHARED_WQ flag to fix foreing requeuing
+    - BUG/MEDIUM: ssl: Revamp the way early data are handled.
+    - MINOR: fd/threads: make _GET_NEXT()/_GET_PREV() use the volatile attribute
+    - BUG/MEDIUM: fd/threads: fix a concurrency issue between add and rm on the same fd
+    - BUG/MINOR: ssl: openssl-compat: Fix getm_ defines
+    - BUG/MEDIUM: stream: Be sure to never assign a TCP backend to an HTX stream
+    - BUILD: ssl: improve SSL_CTX_set_ecdh_auto compatibility
+
 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
diff --git a/VERDATE b/VERDATE
index 35ae6c2..6a3f437 100644
--- a/VERDATE
+++ b/VERDATE
@@ -1,2 +1,2 @@
 $Format:%ci$
-2019/12/11
+2019/12/21
diff --git a/VERSION b/VERSION
index 6cbacdc..280a1e3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.11
+2.0.12
diff --git a/doc/configuration.txt b/doc/configuration.txt
index 99046f4..4f7da73 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -4,7 +4,7 @@
                          ----------------------
                               version 2.0
                              willy tarreau
-                              2019/12/11
+                              2019/12/21
 
 
 This document covers the configuration language as implemented in the version