diff --git a/CHANGELOG b/CHANGELOG
index 12d188669..0f8b73be0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,42 @@
 ChangeLog :
 ===========
 
+2021/05/14 : 2.4.0
+    - BUG/MINOR: http_fetch: fix possible uninit sockaddr in fetch_url_ip/port
+    - CLEANUP: cli/activity: Remove double spacing in set profiling command
+    - CI: Build VTest with clang
+    - CI: extend spellchecker whitelist, add "ists" as well
+    - CLEANUP: assorted typo fixes in the code and comments
+    - BUG/MINOR: memprof: properly account for differences for realloc()
+    - MINOR: memprof: also report the method used by each call
+    - MINOR: memprof: also report the totals and delta alloc-free
+    - CLEANUP: pattern: remove the unused and dangerous pat_ref_reload()
+    - BUG/MINOR: http_act: Fix normalizer names in error messages
+    - MINOR: uri_normalizer: Add `fragment-strip` normalizer
+    - MINOR: uri_normalizer: Add `fragment-encode` normalizer
+    - IMPORT: slz: use the generic function for the last bytes of the crc32
+    - IMPORT: slz: do not produce the crc32_fast table when CRC is natively supported
+    - BUILD/MINOR: opentracing: fixed compilation with filter enabled
+    - BUILD: makefile: add a few popular ARMv8 CPU targets
+    - BUG/MEDIUM: stick_table: fix crash when using tcp smp_fetch_src
+    - REGTESTS: stick-table: add src_conn_rate test
+    - CLEANUP: stick-table: remove a leftover of an old keyword declaration
+    - BUG/MINOR: stats: fix lastchk metric that got accidently lost
+    - EXAMPLES: add a "basic-config-edge" example config
+    - EXAMPLES: add a trivial config for quick testing
+    - DOC: management: Correct example reload command in the document
+    - Revert "CI: Build VTest with clang"
+    - MINOR: activity/cli: optionally support sorting by address on "show profiling"
+    - DEBUG: ssl: export ssl_sock_close() to see its symbol resolved in profiling
+    - BUG/MINOR: lua/vars: prevent get_var() from allocating a new name
+    - DOC: config: Fix configuration example for mqtt
+    - BUG/MAJOR: config: properly initialize cpu_map.thread[] up to MAX_THREADS
+    - BUILD: config: avoid a build warning on numa_detect_topology() without threads
+    - DOC: update min requirements in INSTALL
+    - IMPORT: slz: use inttypes.h instead of stdint.h
+    - BUILD: sample: use strtoll() instead of atoll()
+    - MINOR: version: mention that it's LTS now.
+
 2021/05/10 : 2.4-dev19
     - BUG/MINOR: hlua: Don't rely on top of the stack when using Lua buffers
     - BUG/MEDIUM: cli: prevent memory leak on write errors
diff --git a/VERDATE b/VERDATE
index aed141266..8f58c560f 100644
--- a/VERDATE
+++ b/VERDATE
@@ -1,2 +1,2 @@
 $Format:%ci$
-2021/05/10
+2021/05/14
diff --git a/VERSION b/VERSION
index 96fbe853b..197c4d5c2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.4-dev19
+2.4.0
diff --git a/doc/configuration.txt b/doc/configuration.txt
index 8724330fd..a13a9a77f 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -4,7 +4,7 @@
                          ----------------------
                               version 2.4
                              willy tarreau
-                              2021/05/10
+                              2021/05/14
 
 
 This document covers the configuration language as implemented in the version