diff --git a/CHANGELOG b/CHANGELOG
index 2fbfebb..4bf6378 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,32 @@
 ChangeLog :
 ===========
 
+2022/05/13 : 2.4.17
+    - CI: github actions: update LibreSSL to 3.5.2
+    - SCRIPTS: announce-release: add URL of dev packages
+    - BUG/MEDIUM: mux-fcgi: Be sure to never set EOM flag on an empty HTX message
+    - BUG/MEDIUM: mux-h1: Be able to handle trailers when C-L header was specified
+    - BUG/MAJOR: dns: multi-thread concurrency issue on UDP socket
+    - BUG/MINOR: mux-h2: mark the stream as open before processing it not after
+    - MINOR: mux-h2: report a trace event when failing to create a new stream
+    - DOC: config: Update doc for PR/PH session states to warn about rewrite failures
+    - BUG/MINOR: tcp/http: release the expr of set-{src,dst}[-port]
+    - BUG/MEDIUM: resolvers: make "show resolvers" properly yield
+    - BUG/MEDIUM: cli: make "show cli sockets" really yield
+    - BUG/MINOR: map/cli: protect the backref list during "show map" errors
+    - BUG/MINOR: map/cli: make sure patterns don't vanish under "show map"'s init
+    - DOC: fix typo "ant" for "and" in INSTALL
+    - CI: dynamically determine actual version of h2spec
+    - BUILD: ssl: work around bogus warning in gcc 12's -Wformat-truncation
+    - BUILD: debug: work around gcc-12 excessive -Warray-bounds warnings
+    - BUILD: listener: shut report of possible null-deref in listener_accept()
+    - BUG/MEDIUM: ssl: fix the gcc-12 broken fix :-(
+    - DOC: install: update gcc version requirements
+    - BUG/MINOR: server: Make SRV_STATE_LINE_MAXLEN value from 512 to 2kB (2000 bytes).
+    - BUG/MINOR: conn_stream: do not confirm a connection from the frontend path
+    - BUG/MEDIUM: wdt: don't trigger the watchdog when p is unitialized
+    - CLEANUP: mux-h1: Fix comments and error messages for global options
+
 2022/04/29 : 2.4.16
     - BUG/MINOR: tools: fix url2sa return value with IPv4
     - BUG/MINOR: server/ssl: free the SNI sample expression
diff --git a/VERDATE b/VERDATE
index 1d5600d..cce1228 100644
--- a/VERDATE
+++ b/VERDATE
@@ -1,2 +1,2 @@
 $Format:%ci$
-2022/04/29
+2022/05/13
diff --git a/VERSION b/VERSION
index 4863400..1324c03 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.4.16
+2.4.17
diff --git a/doc/configuration.txt b/doc/configuration.txt
index 3056ea0..af41588 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -3,7 +3,7 @@
                           Configuration Manual
                          ----------------------
                               version 2.4
-                              2022/04/29
+                              2022/05/13
 
 
 This document covers the configuration language as implemented in the version