diff --git a/CHANGES b/CHANGES
index 3206fa29dd..1b764a24f4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,18 @@
+2017.05, Released May 31st, 2017
+
+	Minor fixes.
+
+	External toolchain: musl dynamic linker symlink for mips-sf
+	corrected.
+
+	Updated/fixed packages: agentpp, bash, exim, hans, madplay,
+	qpid-proton, rtl8188eu, snmppp, stm32flash, strongswan, sudo,
+	xen
+
+	Issues resolved (http://bugs.buildroot.org):
+
+	#9906: genimage: Disk full
+
 2017.05-rc3, Released May 30th, 2017
 
 	Fixes all over the tree.
diff --git a/Makefile b/Makefile
index 03989d4036..f4d41ced29 100644
--- a/Makefile
+++ b/Makefile
@@ -86,9 +86,9 @@ else # umask / $(CURDIR) / $(O)
 all:
 
 # Set and export the version string
-export BR2_VERSION := 2017.05-rc3
+export BR2_VERSION := 2017.05
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1496130000
+BR2_VERSION_EPOCH = 1496267000
 
 # 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 64c9edb2ab..c9a0a353cd 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 release: <b>2017.02.2</b></h3>
+      <h3 style="text-align: center;">Latest long term support release: <b>2017.02.2</b></h3>
 
       <div class="row mt centered">
 	<div class="col-sm-6">
@@ -42,6 +42,41 @@
 	</div>
       </div>
 
+      <h3 style="text-align: center;">Latest stable release: <b>2017.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-2017.05.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+	      </div>
+	      <div class="back">
+		<a href="/downloads/buildroot-2017.05.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+	      </div>
+	    </div>
+	  </div>
+	  <h3><a href="/downloads/buildroot-2017.05.tar.gz">buildroot-2017.05.tar.gz</a></h3>
+	  <p><a href="/downloads/buildroot-2017.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-2017.05.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
+	      </div>
+	      <div class="back">
+		<a href="/downloads/buildroot-2017.05.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
+	      </div>
+	    </div>
+	  </div>
+
+	  <h3><a href="/downloads/buildroot-2017.05.tar.bz2">buildroot-2017.05.tar.bz2</a></h3>
+	  <p><a href="/downloads/buildroot-2017.05.tar.bz2.sign">PGP signature</a></p>
+	</div>
+      </div>
+
+<!--
       <h3 style="text-align: center;">Latest release candidate: <b>2017.05-rc3</b></h3>
       <div class="row mt centered">
 	<div class="col-sm-6">
@@ -75,7 +110,7 @@
 	  <p><a href="/downloads/buildroot-2017.05-rc3.tar.bz2.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 a0f25ff7c7..093f7b20cf 100644
--- a/docs/website/news.html
+++ b/docs/website/news.html
@@ -9,6 +9,24 @@
 <h2>News</h2>
 <ul class="timeline">
 
+  <li class="timeline-inverted">
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2017.05 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>31 May 2017</small></p>
+      </div>
+      <div class="timeline-body">
+	<p>The stable 2017.05 release is out - Thanks to everyone
+	  contributing and testing the release candidates. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2017.05">CHANGES</a>
+	  file for more details
+	  and go to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2017.05.tar.bz2">2017.05 release</a>.</p>
+      </div>
+    </div>
+  </li>
+
   <li>
     <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 33ca6b802a..d26f246e03 100644
--- a/support/misc/Vagrantfile
+++ b/support/misc/Vagrantfile
@@ -5,7 +5,7 @@
 ################################################################################
 
 # Buildroot version to use
-RELEASE='2017.02'
+RELEASE='2017.05'
 
 ### Change here for more memory/cores ###
 VM_MEMORY=2048