diff --git a/www/cvs.t b/www/cvs.t
index 07cfe6ba42..72df3a60c5 100644
--- a/www/cvs.t
+++ b/www/cvs.t
@@ -3,8 +3,7 @@
 
 <h2>Browsing the repository</h2>
 
-<p>Just go <a
-href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/rockbox/">here</a>.
+<p>Just go <a href="/viewcvs.cgi/">here</a>.
 
 <h2>Daily snapshots</h2>
 
@@ -28,8 +27,7 @@ installed to do this.
 <li>www - the web page
 </ul>
 
-The examples below use the 'rockbox' module, since that's what most people are
-interested in. We have a few other convenient aliases that gets several
+<p>We have a few other convenient aliases that gets several
 modules at once for you:
 
 <ul>
@@ -39,37 +37,26 @@ modules at once for you:
 <li> website - gets the www and docs modules
 </ul>
 
+<p>The examples below use the 'rockbox' module, since that is what most
+people are interested in. 
+
 <h3>Anonymous read-only checkout</h3>
 
 <p>If you are not a registered developer, use this method.
 When asked for a password, just press enter:
 
-<p><tt>cvs -d:pserver:anonymous@cvs.rockbox.sourceforge.net:/cvsroot/rockbox login
-<br>cvs -z3 -d:pserver:anonymous@cvs.rockbox.sourceforge.net:/cvsroot/rockbox co rockbox</tt>
+<p><tt>cvs -d:pserver:anonymous@rockbox.haxx.se:/cvsroot/rockbox login
+<br>cvs -z3 -d:pserver:anonymous@rockbox.haxx.se:/cvsroot/rockbox co rockbox</tt>
 
 <p>A "rockbox" directory will be created in your current directory, and all
 the directories and source files go there.
 
-<h3>Checkout for developers</h3>
+<h3>Checkout with write access (for developers)</h3>
 
-<p>For this, you need to:
+<p>For this, you need to be added to the writers list by Rockbox administrators. After that, you can login with your username:
 
-<ol>
-<li> Have <a href="http://www.openssh.com">SSH</a> installed.
-<li> Have a <a href="http://sourceforge.net/account/register.php">SourceForge account</a>
-<li> Be a 
-<a href="http://sourceforge.net/project/memberlist.php?group_id=44306">registered developer</a>
-of the Rockbox project
-<li> Log on to your cvs server account once: <tt>ssh <b>username</b>@cvs.rockbox.sourceforge.net</tt> <br>It will disconnect you immediately, but now your account is set up.
-</ol>
-
-<p>Then run:
-
-<p><tt>export CVS_RSH=ssh
-<br>cvs -z3 -d:ext:<b>username</b>@cvs.rockbox.sourceforge.net:/cvsroot/rockbox co rockbox</tt>
-
-<p>If you are using WinCVS, the procedure is
-<a href="http://www.wincvs.org/ssh.html">somewhat different</a>.
+<p><tt>cvs -d:pserver:<b>username</b>@rockbox.haxx.se:/cvsroot/rockbox login
+<br>cvs -z3 -d:pserver:<b>username</b>@rockbox.haxx.se:/cvsroot/rockbox co rockbox</tt>
 
 <h2>Checking in modifications</h2>
 
diff --git a/www/history.t b/www/history.t
index 439151d2d6..d8e40d1326 100644
--- a/www/history.t
+++ b/www/history.t
@@ -2,6 +2,14 @@
 #define HISTORY_PAGE
 #include "head.t"
 
+<p><i>2004-02-05</i>: Rockbox can play <a href="/docs/rvf.html">video</a>, with sound 
+
+<p><i>2003-12-04</i>: Version 2.1 is <a href="/download/">released</a>
+
+<p><i>2003-07-09</i>: Rockbox started from <a href="/docs/flash.html">flash ROM</a> works
+
+<p><i>2003-06-30</i>: The plugin loader is now <a href="http://rockbox.haxx.se/mail/archive/rockbox-archive-2003-06/0707.shtml">alive</a>
+
 <p><i>2003-05-09</i>: The 400-file dir browser limit is <a href="http://rockbox.haxx.se/mail/archive/rockbox-archive-2003-05/0334.shtml">gone</a>.
 
 <p><i>2003-05-03</i>: Finally, FM Radio support for FM Recorder models!
diff --git a/www/main.t b/www/main.t
index d42261967b..83235e9457 100644
--- a/www/main.t
+++ b/www/main.t
@@ -15,18 +15,12 @@ upgrade your ordinary Archos firmware.
 
 <h2>News</h2>
 
+<p><i>2004-05-07</i>: The CVS repository has <a href="/cvs.html">moved</a>
+
 <p><i>2004-03-14</i>: Rockbox can <a href="/lang/">talk</a> to you
 
 <p><i>2004-03-11</i>: Version 2.2 is <a href="/download/">released</a>
 
-<p><i>2004-02-05</i>: Rockbox can play <a href="/docs/rvf.html">video</a>, with sound 
-
-<p><i>2003-12-04</i>: Version 2.1 is <a href="/download/">released</a>
-
-<p><i>2003-07-09</i>: Rockbox started from <a href="/docs/flash.html">flash ROM</a> works
-
-<p><i>2003-06-30</i>: The plugin loader is now <a href="http://rockbox.haxx.se/mail/archive/rockbox-archive-2003-06/0707.shtml">alive</a>
-
 <p><i><small>(Old news items have moved to a 
 <a href="history.html">separate page</a>.)</small></i>