diff --git a/CHANGES b/CHANGES
index aff62f7a68..808d62df8d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,15 @@
+2025.05, released June 9th, 2025
+
+	Various fixes.
+
+	Updated/fixed packages: armadillo, busybox, dhcpcd, dovecot,
+	easyframes, exim, ghostscript, go, gst1-plugins-bad, iputils,
+	jq, libcurl, libftdi1, libglib2, lm-sensors,
+	mender-update-modules, mesa3d, mongoose, mpd, ninja, podman,
+	python-django, python-gobject, qoriq-mc-utils, qt5declarative,
+	qt5webengine, qt5webengine-chromium, qt6base, qt6tools, redis,
+	rtl8723ds, spirv-llvm-translator, unzip, yasm
+
 2025.05-rc2, released May 28th, 2025
 
 	Fixes all over the tree.
diff --git a/Makefile b/Makefile
index f90b834ed2..a0ad100980 100644
--- a/Makefile
+++ b/Makefile
@@ -92,9 +92,9 @@ all:
 .PHONY: all
 
 # Set and export the version string
-export BR2_VERSION := 2025.05-rc2
+export BR2_VERSION := 2025.05
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1748462400
+BR2_VERSION_EPOCH = 1749500000
 
 # 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 5a2af8aff2..efabe51a31 100644
--- a/docs/website/download.html
+++ b/docs/website/download.html
@@ -8,7 +8,7 @@
     <div class="panel-heading">Download</div>
     <div class="panel-body">
 
-      <h3 style="text-align: center;">Latest stable / long term support release: <b>2025.02.3</b></h3>
+      <h3 style="text-align: center;">Latest long term support release: <b>2025.02.3</b></h3>
 
       <div class="row mt centered">
 	<div class="col-sm-6">
@@ -41,41 +41,41 @@
 	  <p><a href="/downloads/buildroot-2025.02.3.tar.xz.sign">PGP signature</a></p>
 	</div>
       </div>
-<!--
-      <h3 style="text-align: center;">Latest stable release: <b>2024.11.2</b></h3>
+
+      <h3 style="text-align: center;">Latest stable release: <b>2025.05</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.11.2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2025.05.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
 	      </div>
 	      <div class="back">
-		<a href="/downloads/buildroot-2024.11.2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2025.05.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
 	      </div>
 	    </div>
 	  </div>
-	  <h3><a href="/downloads/buildroot-2024.11.2.tar.gz">buildroot-2024.11.2.tar.gz</a></h3>
-	  <p><a href="/downloads/buildroot-2024.11.2.tar.gz.sign">PGP signature</a></p>
+	  <h3><a href="/downloads/buildroot-2025.05.tar.gz">buildroot-2025.05.tar.gz</a></h3>
+	  <p><a href="/downloads/buildroot-2025.05.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.11.2.tar.xz"><img src="images/package.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2025.05.tar.xz"><img src="images/package.png" width="180" alt=""></a>
 	      </div>
 	      <div class="back">
-		<a href="/downloads/buildroot-2024.11.2.tar.xz"><img src="images/package.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2025.05.tar.xz"><img src="images/package.png" width="180" alt=""></a>
 	      </div>
 	    </div>
 	  </div>
 
-	  <h3><a href="/downloads/buildroot-2024.11.2.tar.xz">buildroot-2024.11.2.tar.xz</a></h3>
-	  <p><a href="/downloads/buildroot-2024.11.2.tar.xz.sign">PGP signature</a></p>
+	  <h3><a href="/downloads/buildroot-2025.05.tar.xz">buildroot-2025.05.tar.xz</a></h3>
+	  <p><a href="/downloads/buildroot-2025.05.tar.xz.sign">PGP signature</a></p>
 	</div>
       </div>
--->
+<!--
       <h3 style="text-align: center;">Latest release candidate: <b>2025.05-rc2</b></h3>
       <div class="row mt centered">
 	<div class="col-sm-6">
@@ -109,7 +109,7 @@
 	  <p><a href="/downloads/buildroot-2025.05-rc2.tar.xz.sign">PGP signature</a></p>
 	</div>
       </div>
-
+-->
       This and earlier releases (and their PGP signatures) can always be downloaded from
       <a href="/downloads/">http://buildroot.net/downloads/</a>.
     </div>
diff --git a/docs/website/news.html b/docs/website/news.html
index dfc10020ad..0201699f21 100644
--- a/docs/website/news.html
+++ b/docs/website/news.html
@@ -9,6 +9,24 @@
 <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">2025.05 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>9 June 2025</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The stable 2025.05 release is out - Thanks to everyone
+	  contributing and testing the release candidates. See the
+	  <a href="https://gitlab.com/buildroot.org/buildroot/-/blob/2025.05/CHANGES">CHANGES</a>
+	  file for more details
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2025.05.tar.xz">2025.05 release</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">
diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile
index 6c1cdf204a..75a9d2feb1 100644
--- a/support/misc/Vagrantfile
+++ b/support/misc/Vagrantfile
@@ -5,7 +5,7 @@
 ################################################################################
 
 # Buildroot version to use
-RELEASE='2025.02'
+RELEASE='2025.05'
 
 ### Change here for more memory/cores ###
 VM_MEMORY=2048