diff --git a/CHANGES b/CHANGES
index b2bdde5069..8978a2ba7e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,35 @@
+2024.05-rc2, released June 4th, 2024
+
+	Fixes all over the tree.
+
+	Download:
+	- Dropped the (noop) --passive-ftp option from default wget
+	  options for compatibility with wget2
+
+	- Fixed an issue with the generated archives (for
+	  git/svn/cargo/go) when multiple packages share an archive
+	  (E.G. linux vs linux-headers).
+
+	Defconfigs: Fix build issue with binutils 2.41+ for
+	Acmesystems Aria / Arietta, add download hashes for a number
+	of defconfigs. Fix FIT external position for i.MX8 boards
+
+	Updated/fixed packages: dnsmasq, docker-compose, doom-wad,
+	ebtables, esp-hosted, file, freeradius-client,
+	freeradius-server, go, kmod, libmnl, libnetfilter_acct,
+	libnetfilter_log, linux, luarocks, lynx, makedumpfile,
+	micropython, mtd, ncftp, newlib-bare-metal, nfacct, ntp,
+	octave, proftpd, qt5base, systemd, tpm2-tss, uboot-tools,
+	ulogd, vala, zip
+
+	Removed packages: at91bootstrap, at91dataflashboot,
+	on2-8170-libs, on2-8170-modules
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#15973: imx8m bootloader image generation broken since update..
+	#16093: kmod and gcc-14 build error
+
 2024.05-rc1, released May 30th, 2024
 
 	Fixes all over the tree and new features.
diff --git a/Makefile b/Makefile
index 40f862b515..3bef434466 100644
--- a/Makefile
+++ b/Makefile
@@ -90,9 +90,9 @@ all:
 .PHONY: all
 
 # Set and export the version string
-export BR2_VERSION := 2024.05-rc1
+export BR2_VERSION := 2024.05-rc2
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1717102000
+BR2_VERSION_EPOCH = 1717537000
 
 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
diff --git a/docs/website/download.html b/docs/website/download.html
index b6793870a8..33b9b63537 100644
--- a/docs/website/download.html
+++ b/docs/website/download.html
@@ -76,37 +76,37 @@
 	</div>
       </div>
 -->
-      <h3 style="text-align: center;">Latest release candidate: <b>2024.05-rc1</b></h3>
+      <h3 style="text-align: center;">Latest release candidate: <b>2024.05-rc2</b></h3>
       <div class="row mt centered">
 	<div class="col-sm-6">
 	  <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
 	    <div class="flipper">
 	      <div class="front">
-		<a href="/downloads/buildroot-2024.05-rc1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2024.05-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
 	      </div>
 	      <div class="back">
-		<a href="/downloads/buildroot-2024.05-rc1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2024.05-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
 	      </div>
 	    </div>
 	  </div>
 
-	  <h3><a href="/downloads/buildroot-2024.05-rc1.tar.gz">buildroot-2024.05-rc1.tar.gz</a></h3>
-	  <p><a href="/downloads/buildroot-2024.05-rc1.tar.gz.sign">PGP signature</a></p>
+	  <h3><a href="/downloads/buildroot-2024.05-rc2.tar.gz">buildroot-2024.05-rc2.tar.gz</a></h3>
+	  <p><a href="/downloads/buildroot-2024.05-rc2.tar.gz.sign">PGP signature</a></p>
 	</div>
 	<div class="col-sm-6">
 	  <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
 	    <div class="flipper">
 	      <div class="front">
-		<a href="/downloads/buildroot-2024.05-rc1.tar.xz"><img src="images/package.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2024.05-rc2.tar.xz"><img src="images/package.png" width="180" alt=""></a>
 	      </div>
 	      <div class="back">
-		<a href="/downloads/buildroot-2024.05-rc1.tar.xz"><img src="images/package.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2024.05-rc2.tar.xz"><img src="images/package.png" width="180" alt=""></a>
 	      </div>
 	    </div>
 	  </div>
 
-	  <h3><a href="/downloads/buildroot-2024.05-rc1.tar.xz">buildroot-2024.05-rc1.tar.xz</a></h3>
-	  <p><a href="/downloads/buildroot-2024.05-rc1.tar.xz.sign">PGP signature</a></p>
+	  <h3><a href="/downloads/buildroot-2024.05-rc2.tar.xz">buildroot-2024.05-rc2.tar.xz</a></h3>
+	  <p><a href="/downloads/buildroot-2024.05-rc2.tar.xz.sign">PGP signature</a></p>
 	</div>
       </div>
 
diff --git a/docs/website/news.html b/docs/website/news.html
index e13def66cf..f817c0ef74 100644
--- a/docs/website/news.html
+++ b/docs/website/news.html
@@ -9,6 +9,27 @@
 <h2>News</h2>
 <ul class="timeline">
 
+  <li>
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2024.05-rc2 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>4 June 2024</small></p>
+      </div>
+      <div class="timeline-body">
+        <p>Another week, another release candidate with more cleanups and build fixes. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2024.05-rc2">CHANGES</a>
+	  file for more details.</p>
+
+	<p>Go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2024.05-rc2.tar.xz">2024.05-rc2
+	  release</a>, and report any problems found to the
+         <a href="support.html">mailing list</a> or
+         <a href="https://bugs.buildroot.org">bug tracker</a>.</p>
+      </div>
+    </div>
+  </li>
+
   <li class="timeline-inverted">
     <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
     <div class="timeline-panel">