4 files changed, 49 insertions, 19 deletions
diff --git a/docs/docs.html b/docs/docs.html
index 851d1d28c..65eaff1c4 100644
--- a/docs/docs.html
+++ b/docs/docs.html
@@ -2,15 +2,10 @@
 
 <h3>Documentation</h3>
 
-<p>Our document "Buildroot usage and documentation" is where you want
-to start reading if you wish to understand how Buildroot work, or wish
-to change/extend/fix things. If you find any errors (factual,
-grammatical, whatever) please report them. Choose between:</p>
-
-<ul>
-  <li><a href="/downloads/buildroot.html">Latest stable release</a></li>
-  <li><a href="buildroot.html">GIT head revision</a></li>
-</ul>
+<p>The <a href="/downloads/manual/manual.html">Buildroot user manual</a>
+is where you want to start reading if you wish to understand how
+Buildroot works, or wish to change/extend/fix things. If you find any
+errors (factual, grammatical, whatever) please report them to us.</p>
 
 <p>If you find that you need help with Buildroot, you can ask for
 help:</p>
diff --git a/docs/download.html b/docs/download.html
index 7b22569b8..d23e7e9f5 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -6,22 +6,22 @@
 
 <p>
 
-The latest stable release is <b>2012.02</b>, which can be downloaded
+The latest stable release is <b>2012.05</b>, which can be downloaded
 here:<p>
 
-<a href="/downloads/buildroot-2012.02.tar.gz">buildroot-2012.02.tar.gz</a>
+<a href="/downloads/buildroot-2012.05.tar.gz">buildroot-2012.05.tar.gz</a>
 or
-<a href="/downloads/buildroot-2012.02.tar.bz2">buildroot-2012.02.tar.bz2</a>.
+<a href="/downloads/buildroot-2012.05.tar.bz2">buildroot-2012.05.tar.bz2</a>.
 <p>
-
-The latest release candidate is <b>2012.05-rc1</b>, which can be
+<!--
+The latest release candidate is <b>2012.05-rc3</b>, which can be
 downloaded here:<p>
 
-<a href="/downloads/buildroot-2012.05-rc1.tar.gz">buildroot-2012.05-rc1.tar.gz</a>
+<a href="/downloads/buildroot-2012.05-rc3.tar.gz">buildroot-2012.05-rc3.tar.gz</a>
 or
-<a href="/downloads/buildroot-2012.05-rc1.tar.bz2">buildroot-2012.05-rc1.tar.bz2</a>.
+<a href="/downloads/buildroot-2012.05-rc3.tar.bz2">buildroot-2012.05-rc3.tar.bz2</a>.
 <p>
-
+-->
 This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 
diff --git a/docs/header.html b/docs/header.html
index ce5d5558f..aa16d540e 100644
--- a/docs/header.html
+++ b/docs/header.html
@@ -67,7 +67,7 @@
     <br><a href="http://www.ucdot.org/">uCdot</a>
     <br><a href="http://www.linuxdevices.com/">LinuxDevices</a>
     <br><a href="http://slashdot.org/">Slashdot</a>
-    <br><a href="http://freshmeat.net/">Freshmeat</a>
+    <br><a href="http://freecode.com/">Freecode</a>
     <br><a href="http://linuxtoday.com/">Linux Today</a>
     <br><a href="http://lwn.net/">Linux Weekly News</a>
     <br><a href="http://www.tldp.org/HOWTO">Linux HOWTOs</a>
diff --git a/docs/news.html b/docs/news.html
index 8c4871fe3..8b5265018 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -5,12 +5,47 @@
 <p>
 
 <ul>
+  <li><b>30 May 2012 -- 2012.05 released</b>
+
+    <p>The stable 2012.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=2012.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-2012.05.tar.bz2">2012.05 release</a>.</p>
+
+  <li><b>25 May 2012 -- 2012.05-rc3 released</b>
+
+    <p>RC3 is out with more bugfixes - See the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.05_rc3">CHANGES</a>
+    file for details.
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2012.05-rc3.tar.bz2">2012.05-rc3
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
+  <li><b>18 May 2012 -- 2012.05-rc2 released</b>
+
+    <p>Another week, another release candidate with more cleanups and
+    build fixes. See the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.05_rc2">CHANGES</a>
+    file for details.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2012.05-rc2.tar.bz2">2012.05-rc2
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
   <li><b>10 May 2012 -- 2012.05-rc1 released</b>
 
     <p>We have a new release candidate! Lots of changes all over the
     tree, see the <a
     href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2012.05_rc1">CHANGES</a>
-    file for details</p>
+    file for details, and read the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2012-May/053736.html">announcement</a>.</p>
 
     <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
     <a href="/downloads/buildroot-2012.05-rc1.tar.bz2">2012.05-rc1