diff --git a/CHANGELOG b/CHANGELOG
index 712ddb3..fa452d1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,67 @@
 ChangeLog :
 ===========
 
+2021/01/08 : 2.0.20
+    - BUG/MINOR: pattern: a sample marked as const could be written
+    - BUG/MINOR: lua: set buffer size during map lookups
+    - BUG/MINOR: peers: Do not ignore a protocol error for dictionary entries.
+    - BUG/MINOR: peers: Missing TX cache entries reset.
+    - BUG/MEDIUM: peers: fix decoding of multi-byte length in stick-table messages
+    - BUG/MINOR: http-fetch: Extract cookie value even when no cookie name
+    - BUG/MINOR: http-fetch: Fix calls w/o parentheses of the cookie sample fetches
+    - BUG/MAJOR: spoe: Be sure to remove all references on a released spoe applet
+    - MINOR: spoe: Don't close connection in sync mode on processing timeout
+    - MINOR: cfgparse: tighten the scope of newnameserver variable, free it on error.
+    - BUILD: http-htx: fix build warning regarding long type in printf
+    - BUG/MEDIUM: filters: Forward all filtered data at the end of http filtering
+    - BUG/MINOR: http-ana: Don't wait for the body of CONNECT requests
+    - BUG/MAJOR: filters: Always keep all offsets up to date during data filtering
+    - BUG/MAJOR: peers: fix partial message decoding
+    - DOC: config: Move req.hdrs and req.hdrs_bin in L7 samples fetches section
+    - MINOR: plock: use an ARMv8 instruction barrier for the pause instruction
+    - BUG/MINOR: lua: lua-load doesn't check its parameters
+    - BUG/MINOR: lua: Post init register function are not executed beyond the first one
+    - BUG/MINOR: lua: Some lua init operation are processed unsafe
+    - MINOR: actions: Export actions lookup functions
+    - MINOR: actions: add a function returning a service pointer from its name
+    - MINOR: cli: add a function to look up a CLI service description
+    - BUG/MINOR: lua: warn when registering action, conv, sf, cli or applet multiple times
+    - DOC/MINOR: Fix formatting in Management Guide
+    - BUG/MAJOR: spoa/python: Fixing return None
+    - DOC: spoa/python: Fixing typo in IP related error messages
+    - DOC: spoa/python: Rephrasing memory related error messages
+    - DOC: spoa/python: Fixing typos in comments
+    - BUG/MINOR: spoa/python: Cleanup references for failed Module Addobject operations
+    - BUG/MINOR: spoa/python: Cleanup ipaddress objects if initialization fails
+    - BUG/MEDIUM: spoa/python: Fixing PyObject_Call positional arguments
+    - BUG/MEDIUM: spoa/python: Fixing references to None
+    - DOC: email change of the DeviceAtlas maintainer
+    - BUG/MINOR: tools: make parse_time_err() more strict on the timer validity
+    - BUG/MINOR: tools: Reject size format not starting by a digit
+    - BUG/MEDIUM: lb-leastconn: Reposition a server using the right eweight
+    - CLEANUP: lua: Remove declaration of an inexistant function
+    - CLEANUP: contrib/prometheus-exporter: typo fixes for ssl reuse metric
+    - REGTESTS: make use of HAPROXY_ARGS and pass -dM by default
+    - BUILD: Makefile: have "make clean" destroy .o/.a/.s in contrib subdirs as well
+    - BUG/MINOR: mux-h1: Don't set CS_FL_EOI too early for protocol upgrade requests
+    - BUG/MEDIUM: http-ana: Never for sending data in TUNNEL mode
+    - CONTRIB: halog: fix build issue caused by %L printf format
+    - CONTRIB: halog: mark the has_zero* functions unused
+    - CONTRIB: halog: fix signed/unsigned build warnings on counts and timestamps
+    - BUILD: plock: remove dead code that causes a warning in gcc 11
+    - BUILD: hpack: hpack-tbl-t.h uses VAR_ARRAY but does not include compiler.h
+    - MINOR: atomic: don't use ; to separate instruction on aarch64.
+    - BUG/MINOR: cfgparse: Fail if the strdup() for `rule->be.name` for `use_backend` fails
+    - SCRIPTS: improve announce-release to support different tag and versions
+    - SCRIPTS: make announce release support preparing announces before tag exists
+    - BUG/MINOR: srv: do not init address if backend is disabled
+    - BUILD: Makefile: exclude broken tests by default
+    - MINOR: contrib/prometheus-exporter: export build_info
+    - DOC: fix some spelling issues over multiple files
+    - SCRIPTS: announce-release: fix typo in help message
+    - DOC: Add maintainers for the Prometheus exporter
+    - BUG/MINOR: sample: fix concat() converter's corruption with non-string variables
+
 2020/11/06 : 2.0.19
     - DOC: ssl: crt-list negative filters are only a hint
     - BUILD: makefile: Fix building with closefrom() support enabled
diff --git a/VERDATE b/VERDATE
index 1c05602..2926d22 100644
--- a/VERDATE
+++ b/VERDATE
@@ -1,2 +1,2 @@
 $Format:%ci$
-2020/11/06
+2021/01/08
diff --git a/VERSION b/VERSION
index ed2af5c..d17d1f3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.19
+2.0.20
diff --git a/doc/configuration.txt b/doc/configuration.txt
index 1cb14bf..a2a42ab 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -4,7 +4,7 @@
                          ----------------------
                               version 2.0
                              willy tarreau
-                              2020/11/06
+                              2021/01/08
 
 
 This document covers the configuration language as implemented in the version
diff --git a/src/haproxy.c b/src/haproxy.c
index 75228c7..8bfc8bc 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1,6 +1,6 @@
 /*
  * HA-Proxy : High Availability-enabled HTTP/TCP proxy
- * Copyright 2000-2020 Willy Tarreau <willy@haproxy.org>.
+ * Copyright 2000-2021 Willy Tarreau <willy@haproxy.org>.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License