diff --git a/www/docs/index.t b/www/docs/index.t
index b79eef83aa..ea7224ed15 100644
--- a/www/docs/index.t
+++ b/www/docs/index.t
@@ -5,7 +5,7 @@
 <ul>
 <li> <a href="faq.html">Frequently Asked Questions</a>
 <li> <a href="battery-faq.html">Frequently Asked Questions about Batteries and Charging</a>
-<li> <a href="/manual/">User manual</a>
+<li> <a href="/manual/manual.pdf">User manual</a>
 <li> <a href="features.html">Feature Comparison Chart</a>
 <li> <a href="nodo.html">Features We Will Not Implement</a>
 <li> <a href="custom_wps_format.html">How to make a custom WPS</a>
diff --git a/www/download/index.t b/www/download/index.t
index 98ef12c820..01da64bc70 100644
--- a/www/download/index.t
+++ b/www/download/index.t
@@ -2,42 +2,46 @@
 #define DOWNLOAD_PAGE
 #include "head.t"
 
-<h2>Latest version: 1.4</h2>
+<h2>Latest version: 2.0</h2>
 
-<p>Please read the <a href="rockbox-1.4-notes.txt">release notes</a>. (<a href="old.html">Older releases</a>)
+<p>Please read the <a href="rockbox-2.0-notes.txt">release notes</a>. (<a href="old.html">Older releases</a>)
 
 <p>
 <table class=rockbox><tr>
-<th>player-old</th>
 <th>player</th>
 <th>recorder</th>
+<th>fm recorder</th>
 </tr><tr>
 <td>
-This version is for old Archos Jukebox 6000 models with ROM firmware older than 4.50.
-
+This version is for Archos Jukebox 5000, 6000 and all Studio models.
 <ul>
-<li><a href="rockbox-1.4-player-old.zip">rockbox-1.4-player-old.zip</a>
+<li><a href="rockbox-2.0-player.zip">rockbox-2.0-player.zip</a>
+<br>(137 KB)
 </ul>
 
 </td><td>
-This version is for Archos Jukebox 5000, 6000 with ROM firmware 4.50 or later, and all Studio models.
+This version is for all non-FM Archos Jukebox Recorder models.
 
 <ul>
-<li><a href="rockbox-1.4-player-new.zip">rockbox-1.4-player-new.zip</a>
+<li><a href="rockbox-2.0-recorder.zip">rockbox-2.0-recorder.zip</a>
+<br>(231 KB)
 </ul>
 
-</td><td>
-This version is for Archos Jukebox Recorder 6, 10, 15 and 20. It does <b>not</b> work with the FM Recorder.
+</td>
+<td>
+This version is for Archos Jukebox FM Recorder.
 
 <ul>
-<li><a href="rockbox-1.4-recorder.zip">rockbox-1.4-recorder.zip</a>
+<li><a href="rockbox-2.0-fmrecorder.zip">rockbox-2.0-fmrecorder.zip</a>
+<br>(229 KB)
 </ul>
 
-</td></tr></table>
+</td>
+</tr></table>
 
 <h3>Source code</h3>
 <ul>
-<li><a href="rockbox-1.4.tar.gz">rockbox-1.4.tar.gz</a>
+<li><a href="rockbox-2.0.tar.gz">rockbox-2.0.tar.gz</a>
 </ul>
 
 <h3>Auxiliary files</h3>
@@ -56,6 +60,10 @@ This version is for Archos Jukebox Recorder 6, 10, 15 and 20. It does <b>not</b>
 
 <p>If you ever want to remove the Rockbox firmware, simply delete archos.mod (player) or ajbrec.ajz (recorder) from the root of your Archos disk.
 
+<h2>Manual</h2>
+
+<p>We have a brand new <a href="/manual/manual.pdf">manual in PDF format</a>. Please read it.
+
 <h2>Bug reports</h2>
 
 <p>Please use our <a href="/bugs.shtml">bug page</a>
diff --git a/www/download/old.t b/www/download/old.t
index 1d3cb316d3..1830c886a2 100644
--- a/www/download/old.t
+++ b/www/download/old.t
@@ -2,6 +2,7 @@
 #define OLDRELEASES_PAGE
 #include "head.t"
 
+<p><a href="rockbox-1.4-notes.txt">1.4 release notes</a>.
 <p><a href="rockbox-1.3-notes.txt">1.3 release notes</a>.
 <p><a href="rockbox-1.2-notes.txt">1.1 release notes</a>.
 <p><a href="rockbox-1.1-notes.txt">1.1 release notes</a>.
diff --git a/www/history.t b/www/history.t
index 6826d9956a..ca4a905355 100644
--- a/www/history.t
+++ b/www/history.t
@@ -2,6 +2,19 @@
 #define HISTORY_PAGE
 #include "head.t"
 
+<p><i>2003-02-14</i>: Matthew P. O'Reilly gave Linus an FM Recorder  for his birthday!
+Linus had it for 2 hours before he took it apart and started drawing schematics...
+
+<p><i>2003-01-10</i>: Full ISO-8859-1 font support added for Players, using the <a href="/docs/rocklatin.html">Rocklatin1</a> dynamic charset system.
+
+<p><i>2002-12-21</i>: You can now donate to the Rockbox project via PayPal. See the new button in the left menu.
+
+<p><i>2002-11-10</i>: Added recording functionality.
+
+<p><i>2002-10-15</i>: Now the Player/Studio models run the same firmware. No more Old and New player firmware.
+
+<p><i>2002-10-11</i>: Version 1.4 is released. <a href="download/">Grab it</a>.
+
 <p><i>2002-09-19</i>: We now support multiple languages. You can help by translating Rockbox to your language. No programming skills required.
 <a href="http://rockbox.haxx.se/mail/archive/rockbox-archive-2002-09/0856.shtml">See instructions here</a>
 
diff --git a/www/main.t b/www/main.t
index 8a55b3a0ce..4ec106bb4b 100644
--- a/www/main.t
+++ b/www/main.t
@@ -9,57 +9,35 @@
 
 <h2>News</h2>
 
+<p><i>2003-04-15</i>: Version 2.0 is <a href="/download/">released</a>
+
 <p><i>2003-04-01</i>: <a href="/doom/">Play Doom on the Archos Recorder</a>!
 
-<p><i>2003-02-17</i>: Rockbox <a href="/daily.shtml">daily builds</a> works on
-the FM Recorder now.
-
-<p><i>2003-02-14</i>: Matthew P. O'Reilly gave Linus an FM Recorder  for his birthday!
-Linus had it for 2 hours before he took it apart and started drawing schematics...
-
-<p><i>2003-01-10</i>: Full ISO-8859-1 font support added for Players, using the <a href="/docs/rocklatin.html">Rocklatin1</a> dynamic charset system.
-
-<p><i>2002-12-21</i>: You can now donate to the Rockbox project via PayPal. See the new button in the left menu.
-
-<p><i>2002-11-10</i>: Added recording functionality.
-
-<p><i>2002-10-15</i>: Now the Player/Studio models run the same firmware. No more Old and New player firmware.
-
-<p><i>2002-10-11</i>: Version 1.4 is released. <a href="download/">Grab it</a>.
+<p><i>2003-02-17</i>: Rockbox <a href="/daily.shtml">daily builds</a> now work on
+the FM Recorder.
 
 <p><i><small>(Old news items have moved to a 
 <a href="history.html">separate page</a>.)</small></i>
 
-<h2>Recent CVS activity</h2>
-<p>
-<!--#include file="lastcvs.link" -->
-
 <h2>Roadmap</h2>
 <p>This is a rough indication of which features we plan/expect/hope to be
 included in which versions. Naturally, this is all subject to change without
 notice.
 
 <dl>
-<dt><b>Version 2.0</b>
-<dd> Recording, Autobuild playlists, File/directory management
+<dt><b>Version 2.1</b>
+<dd> Lots of features and fixes that were held off for 2.0
+
+<dt><b>Version 2.2</b>
+<dd> User interface overhaul
+
+<dt><b>Version 2.3</b>
+<dd> Plugin loader, opening the door for a bucketful of new applications
+
 </dl>
 
-<h2>About the hardware</h2>
-
-<p>I wrote a <a href="internals/bjorn.html">"dissection" page</a> some months ago,
-showing the inside of the Archos and listing the main components.
-I have also collected a couple of <a href="docs/">data sheets</a>.
-Also, don't miss the <a href="notes.html">research notes</a>
-from my reverse-engineering the firmware.
-
-<h2>About the software</h2>
-
-<p>The player has one version of the firmware in ROM.
-The first thing this version does after boot is to look for a file called
-"archos.mod" on the Player/Studio or "ajbrec.ajz" on the recorder in the
-root directory of the harddisk. 
-If it exists, it is loaded into RAM and started.
-This is how firmware upgrades are loaded. Note that you can revert to the ROM
-version by just deleting the firmware file.
+<h2>Recent CVS activity</h2>
+<p>
+<!--#include file="lastcvs.link" -->
 
 #include "foot.t"