diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5108c1a6e..8305ea2cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,9 +3,9 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [24.05rc2] - 2024-05-29: "CODENAME"
+## [24.05] - 2024-06-04: "The Infinitely Divisible Satoshi"
 
-This release named by @USERNAME.
+This release named by @daywalker90.
 
 ### Added
 
@@ -92,6 +92,9 @@ Note: You should always set `allow-deprecated-apis=false` to test for changes.
  - offers: Fix blinded paths in invoices - use node_id and set final node's CLTV delta. ([#7311])
  - Plugins: The recover plugin now avoids trying to recover closed channels. ([#7216])
  - Gossmap: Avoid adding redundant channel announcements to the gossip_store. ([#7330])
+ - Protocol: forward legacy non-TLV onions which we removed in 22.11 and spec itself in Feb 2022.  Still sent by LND nodes who haven't seen our node_announcement. ([#7352])
+ - Protocol: we once again send CHANNEL_REESTABLISH responses on closing channels. ([#7353])
+ - Fixed a crash when processing pending node announcements. ([#7368])
 
 
 ### EXPERIMENTAL
@@ -101,6 +104,9 @@ Note: You should always set `allow-deprecated-apis=false` to test for changes.
 
 
 
+[#7368]: https://github.com/ElementsProject/lightning/pull/7368
+[#7353]: https://github.com/ElementsProject/lightning/pull/7353
+[#7352]: https://github.com/ElementsProject/lightning/pull/7352
 [#7159]: https://github.com/ElementsProject/lightning/pull/7159
 [#7116]: https://github.com/ElementsProject/lightning/pull/7116
 [#7230]: https://github.com/ElementsProject/lightning/pull/7230
@@ -148,7 +154,7 @@ Note: You should always set `allow-deprecated-apis=false` to test for changes.
 [#7211]: https://github.com/ElementsProject/lightning/pull/7211
 [#7237]: https://github.com/ElementsProject/lightning/pull/7237
 [#7256]: https://github.com/ElementsProject/lightning/pull/7256
-[24.05rc1]: https://github.com/ElementsProject/lightning/releases/tag/v24.05rc1
+[24.05]: https://github.com/ElementsProject/lightning/releases/tag/v24.05
 
 
 
diff --git a/contrib/pyln-client/pyln/client/__init__.py b/contrib/pyln-client/pyln/client/__init__.py
index 1233c53e8..aaf07f53a 100644
--- a/contrib/pyln-client/pyln/client/__init__.py
+++ b/contrib/pyln-client/pyln/client/__init__.py
@@ -3,7 +3,7 @@ from .plugin import Plugin, monkey_patch, RpcException
 from .gossmap import Gossmap, GossmapNode, GossmapChannel, GossmapHalfchannel, GossmapNodeId, LnFeatureBits
 from .gossmapstats import GossmapStats
 
-__version__ = "24.05rc2"
+__version__ = "24.05"
 
 __all__ = [
     "LightningRpc",
diff --git a/contrib/pyln-client/pyproject.toml b/contrib/pyln-client/pyproject.toml
index 3e78696e9..a44b34f7f 100644
--- a/contrib/pyln-client/pyproject.toml
+++ b/contrib/pyln-client/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyln-client"
-version = "24.05rc2"
+version = "24.05"
 description = "Client library and plugin library for Core Lightning"
 authors = ["Christian Decker <decker.christian@gmail.com>"]
 license = "BSD-MIT"
diff --git a/contrib/pyln-proto/pyln/proto/__init__.py b/contrib/pyln-proto/pyln/proto/__init__.py
index 0fc38f99b..00b090aca 100644
--- a/contrib/pyln-proto/pyln/proto/__init__.py
+++ b/contrib/pyln-proto/pyln/proto/__init__.py
@@ -4,7 +4,7 @@ from .invoice import Invoice
 from .onion import OnionPayload, TlvPayload, LegacyOnionPayload
 from .wire import LightningConnection, LightningServerSocket
 
-__version__ = "24.05rc2"
+__version__ = "24.05"
 
 __all__ = [
     "Invoice",
diff --git a/contrib/pyln-proto/pyproject.toml b/contrib/pyln-proto/pyproject.toml
index 0e4e63db4..017246b72 100644
--- a/contrib/pyln-proto/pyproject.toml
+++ b/contrib/pyln-proto/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyln-proto"
-version = "24.05rc2"
+version = "24.05"
 description = "This package implements some of the Lightning Network protocol in pure python. It is intended for protocol testing and some minor tooling only. It is not deemed secure enough to handle any amount of real funds (you have been warned!)."
 authors = ["Christian Decker <decker.christian@gmail.com>"]
 license = "BSD-MIT"
diff --git a/contrib/pyln-testing/pyln/testing/__init__.py b/contrib/pyln-testing/pyln/testing/__init__.py
index 6649937ee..b3bc9952b 100644
--- a/contrib/pyln-testing/pyln/testing/__init__.py
+++ b/contrib/pyln-testing/pyln/testing/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "24.05rc2"
+__version__ = "24.05"
 
 __all__ = [
     "__version__",
diff --git a/contrib/pyln-testing/pyproject.toml b/contrib/pyln-testing/pyproject.toml
index d1b92e21c..d0ef5d7f9 100644
--- a/contrib/pyln-testing/pyproject.toml
+++ b/contrib/pyln-testing/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyln-testing"
-version = "24.05rc2"
+version = "24.05"
 description = "Test your Core Lightning integration, plugins or whatever you want"
 authors = ["Christian Decker <decker.christian@gmail.com>"]
 license = "BSD-MIT"