diff --git a/CHANGELOG b/CHANGELOG
index 0f8b73b..a8c6c48 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,81 @@
 ChangeLog :
 ===========
 
+2021/06/17 : 2.4.1
+    - BUG/MEDIUM: ebtree: Invalid read when looking for dup entry
+    - BUG/MAJOR: server: prevent deadlock when using 'set maxconn server'
+    - BUILD/MINOR: opentracing: fixed build when using clang
+    - BUG/MEDIUM: filters: Exec pre/post analysers only one time per filter
+    - BUG/MINOR: http-comp: Preserve HTTP_MSGF_COMPRESSIONG flag on the response
+    - Revert "MEDIUM: http-ana: Deal with L7 retries in HTTP analysers"
+    - BUG/MINOR: http-ana: Send the right error if max retries is reached on L7 retry
+    - BUG/MINOR: http-ana: Handle L7 retries on refused early data before K/A aborts
+    - MINOR: http-ana: Perform L7 retries because of status codes in response analyser
+    - MINOR: cfgparse: Fail when encountering extra arguments in macro
+    - DOC: intro: Fix typo in starter guide
+    - BUG/MINOR: server: Missing calloc return value check in srv_parse_source
+    - BUG/MINOR: peers: Missing calloc return value check in peers_register_table
+    - BUG/MINOR: ssl: Missing calloc return value check in ssl_init_single_engine
+    - BUG/MINOR: http: Missing calloc return value check in parse_http_req_capture
+    - BUG/MINOR: proxy: Missing calloc return value check in proxy_parse_declare
+    - BUG/MINOR: proxy: Missing calloc return value check in proxy_defproxy_cpy
+    - BUG/MINOR: http: Missing calloc return value check while parsing tcp-request/tcp-response
+    - BUG/MINOR: http: Missing calloc return value check while parsing tcp-request rule
+    - BUG/MINOR: compression: Missing calloc return value check in comp_append_type/algo
+    - BUG/MINOR: worker: Missing calloc return value check in mworker_env_to_proc_list
+    - BUG/MINOR: http: Missing calloc return value check while parsing redirect rule
+    - BUG/MINOR: http: Missing calloc return value check in make_arg_list
+    - BUG/MINOR: proxy: Missing calloc return value check in chash_init_server_tree
+    - CLEANUP: http-ana: Remove useless if statement about L7 retries
+    - BUG/MINOR: vars: Be sure to have a session to get checks variables
+    - DOC/MINOR: move uuid in the configuration to the right alphabetical order
+    - BUG/MAJOR: stream-int: Release SI endpoint on server side ASAP on retry
+    - MINOR: errors: allow empty va_args for diag variadic macro
+    - DOC: use the req.ssl_sni in examples
+    - BUILD: make tune.ssl.keylog available again
+    - BUG/MINOR: ssl: OCSP stapling does not work if expire too far in the future
+    - Revert "BUG/MINOR: opentracing: initialization after establishing daemon mode"
+    - BUG/MEDIUM: opentracing: initialization before establishing daemon and/or chroot mode
+    - BUG/MEDIUM: compression: Fix loop skipping unused blocks to get the next block
+    - BUG/MEDIUM: compression: Properly get the next block to iterate on payload
+    - BUG/MEDIUM: compression: Add a flag to know the filter is still processing data
+    - BUG/MINOR: pools: fix a possible memory leak in the lockless pool_flush()
+    - BUG/MINOR: pools: make DEBUG_UAF always write to the to-be-freed location
+    - MINOR: pools: do not maintain the lock during pool_flush()
+    - MINOR: pools: call malloc_trim() under thread isolation
+    - MEDIUM: pools: use a single pool_gc() function for locked and lockless
+    - BUG/MAJOR: pools: fix possible race with free() in the lockless variant
+    - CLEANUP: pools: remove now unused seq and pool_free_list
+    - BUG/MAJOR: htx: Fix htx_defrag() when an HTX block is expanded
+    - BUG/MINOR: mux-fcgi: Expose SERVER_SOFTWARE parameter by default
+    - CLEANUP: l7-retries: do not test the buffer before calling b_alloc()
+    - BUG/MINOR: resolvers: answser item list was randomly purged or errors
+    - MEDIUM: resolvers: add a ref on server to the used A/AAAA answer item
+    - MEDIUM: resolvers: add a ref between servers and srv request or used SRV record
+    - BUG/MAJOR: resolvers: segfault using server template without SRV RECORDs
+    - DOC: lua: Add a warning about buffers modification in HTTP
+    - BUG/MINOR: stick-table: insert srv in used_name tree even with fixed id
+    - BUG/MEDIUM: server: extend thread-isolate over much of CLI 'add server'
+    - BUG/MEDIUM: server: clear dynamic srv on delete from proxy id/name trees
+    - BUG/MEDIUM: server: do not forget to generate the dynamic servers ids
+    - BUG/MINOR: server: do not keep an invalid dynamic server in px ids tree
+    - BUG/MEDIUM: server: do not auto insert a dynamic server in px addr_node
+    - BUG/MEDIUM: shctx: use at least thread-based locking on USE_PRIVATE_CACHE
+    - BUG/MINOR: ssl: use atomic ops to update global shctx stats
+    - BUG/MINOR: mworker: fix typo in chroot error message
+    - CLEANUP: global: remove unused definition of stopping_task[]
+    - BUG/MAJOR: queue: set SF_ASSIGNED when setting strm->target on dequeue
+    - MINOR: backend: only skip LB when there are actual connections
+    - BUG/MINOR: mux-h1: do not skip the error response on bad requests
+    - BUG/MINOR: server: explicitly set "none" init-addr for dynamic servers
+    - MINOR: connection: add helper conn_append_debug_info()
+    - MINOR: mux-h2/trace: report a few connection-level info during h2_init()
+    - CLEANUP: mux-h2/traces: better align user messages
+    - BUG/MINOR: stats: make "show stat typed desc" work again
+    - MINOR: mux-h2: obey http-ignore-probes during the preface
+    - BUG/MINOR: mux-h2/traces: bring back the lost "rcvd H2 REQ" trace
+    - BUG/MINOR: mux-h2/traces: bring back the lost "sent H2 REQ/RES" traces
+
 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
diff --git a/VERDATE b/VERDATE
index 8f58c56..be71603 100644
--- a/VERDATE
+++ b/VERDATE
@@ -1,2 +1,2 @@
 $Format:%ci$
-2021/05/14
+2021/06/17
diff --git a/VERSION b/VERSION
index 197c4d5..005119b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.4.0
+2.4.1
diff --git a/doc/configuration.txt b/doc/configuration.txt
index 378ef7e..a48ba99 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -4,7 +4,7 @@
                          ----------------------
                               version 2.4
                              willy tarreau
-                              2021/05/14
+                              2021/06/17
 
 
 This document covers the configuration language as implemented in the version