diff --git a/CHANGELOG b/CHANGELOG
index 0ae5362..c1704c7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,26 @@
 ChangeLog :
 ===========
 
+2021/08/17 : 2.0.24
+    - BUG/MEDIUM: tcp-check: Do not dereference inexisting connection
+    - BUILD: add detection of missing important CFLAGS
+    - BUG/MEDIUM: mworker: do not register an exit handler if exit is expected
+    - BUG/MINOR: mworker: do not export HAPROXY_MWORKER_REEXEC across programs
+    - BUG/MINOR: systemd: must check the configuration using -Ws
+    - BUG/MINOR: mux-h2: Obey dontlognull option during the preface
+    - BUG/MEDIUM: mux-h2: Handle remaining read0 cases on partial frames
+    - BUG/MINOR: connection: Add missing error labels to conn_err_code_str
+    - BUG/MINOR: server: update last_change on maint->ready transitions too
+    - MINOR: spoe: Add a pointer on the filter config in the spoe_agent structure
+    - BUG/MEDIUM: spoe: Create a SPOE applet if necessary when the last one is released
+    - BUG/MEDIUM: spoe: Fix policy to close applets when SPOE connections are queued
+    - DOC: Improve the lua documentation
+    - DOC: config: Fix 'http-response send-spoe-group' documentation
+    - MINOR: mux-h1/proxy: Add a proxy option to disable clear h2 upgrade
+    - DOC/MINOR: fix typo in management document
+    - BUG/MAJOR: h2: enforce stricter syntax checks on the :method pseudo-header
+    - REGTESTS: add a test to prevent h2 desync attacks
+
 2021/07/16 : 2.0.23
     - DOC: Explicitly state only IPv4 are supported by forwardfor/originalto options
     - BUG/MINOR: tools: fix parsing "us" unit for timers
diff --git a/VERDATE b/VERDATE
index 44ac691..114c5dd 100644
--- a/VERDATE
+++ b/VERDATE
@@ -1,2 +1,2 @@
 $Format:%ci$
-2021/07/16
+2021/08/17
diff --git a/VERSION b/VERSION
index 18f812f..8f4c02d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.23
+2.0.24
diff --git a/doc/configuration.txt b/doc/configuration.txt
index 2952964..273ab26 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -4,7 +4,7 @@
                          ----------------------
                               version 2.0
                              willy tarreau
-                              2021/07/16
+                              2021/08/17
 
 
 This document covers the configuration language as implemented in the version