diff --git a/docs/contents.html b/docs/contents.html
index ae11444fbe2..76ce458bc56 100644
--- a/docs/contents.html
+++ b/docs/contents.html
@@ -47,8 +47,8 @@
 <b>Developer Topics</b>
 <ul>
 <li><a href="http://sourceforge.net/projects/mesa3d" target="_parent">SourceForge homepage</a>
+<li><a href="cvs_access.html" target="MainFrame">CVS Access</a>
 <li><a href="cvs_branches.html" target="MainFrame">CVS Branch Info</a>
-<li><a href="cvs_anonymous.html" target="MainFrame">Anonymous CVS Access</a>
 <li><a href="utilities.html" target="MainFrame">Utilities</a>
 <li><a href="helpwanted.html" target="MainFrame">Help Wanted</a>
 <li><a href="devinfo.html" target="MainFrame">Development Notes</a>
diff --git a/docs/cvs_access.html b/docs/cvs_access.html
new file mode 100644
index 00000000000..65a549f3791
--- /dev/null
+++ b/docs/cvs_access.html
@@ -0,0 +1,100 @@
+<HTML>
+
+<TITLE>CVS Access</TITLE>
+
+<BODY text="#000000" bgcolor="#55bbff" link="#111188">
+
+<h1>CVS Access</h1>
+
+<p>
+Mesa's CVS repository (code management system) is hosted on
+<a href="http://www.freedesktop.org" target="_parent">freedesktop.org</a>.
+</p>
+
+<p>
+You may access the repository either as an
+<a href="#anonymous">anonymous user</a> (read-only) or as a
+<a href="#developer">developer</a>
+(read/write).
+</p>
+
+<p>
+You may also 
+<a href="http://freedesktop.org/cgi-bin/viewcvs.cgi/mesa/Mesa/"
+target="_parent">browse the CVS repository</a>.
+</p>
+
+
+<a name="anonymous">
+<H2>Anonymous CVS Access</H2>
+
+<p>
+Anonymous, public, read-only access to the CVS repository is available.
+Here are the basic instructions for Unix systems:
+</p>
+
+<ol>
+<li>Install CVS client software on your computer if needed.
+    Version 1.9.28 is known to work.
+<li>Login as an anonymous user:
+    <pre>
+    cvs -d:pserver:anonymous@pdx.freedesktop.org:/cvs/mesa login
+    </pre>
+    Just press Enter/Return when prompted for a password.
+    <br>
+    <br>
+<li>Check out the code:
+    <pre>
+    cvs -d:pserver:anonymous@pdx.freedesktop.org:/cvs/mesa co Mesa
+    </pre>
+</ol>
+
+
+<p>To update your Mesa CVS source to the latest CVS source:</p>
+
+<ol>
+<li><code>cd Mesa</code>
+<li><code>cvs -z3 -d:pserver:anonymous@pdx.freedesktop.org:/cvs/mesa update</code>
+</ol>
+
+
+<a name="developer">
+<H2>Developer CVS Access</H2>
+
+<p>
+Mesa developers working with the Mesa CVS repository need to first
+have an account on <a href="http://www.freedesktop.org" target="_parent">
+freedesktop.org</a>.
+You can request an account from <a href="mailto:eta@lclark.edu">Eric Anholt</a>.
+</p>
+
+<p>
+Once your account is established, you can check out the Mesa CVS tree
+with:
+<pre>
+   setenv CVS_RSH ssh        (if using a csh-like shell)
+</pre>
+<em>OR</em>
+<pre>
+   export CVS_RSH=rsh        (if using a bash-like shell)
+</pre>
+followed by:
+<pre>
+   cvs -d:ext:yourusername@pdx.freedesktop.org:/cvs/mesa co Mesa
+</pre>
+
+<p>
+Of course, replace <em>yourusername</em> with your actual login name.
+</p>
+
+<p>
+Subsequent updates should only require:
+</p>
+<pre>
+   cvs update
+</pre>
+
+
+
+</body>
+</html>
diff --git a/docs/cvs_anonymous.html b/docs/cvs_anonymous.html
deleted file mode 100644
index e1f89520841..00000000000
--- a/docs/cvs_anonymous.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<HTML>
-
-<TITLE>Anonymous CVS</TITLE>
-
-<BODY text="#000000" bgcolor="#55bbff" link="#111188">
-
-<H1>Anonymous CVS</H1>
-
-<p>
-Anonymous, public, read-only access to the code in CVS is
-available. Here are the basic instructions for Unix systems:
-</p>
-
-<ol>
-	<li>Install CVS client software on your computer. Version 1.9.28 is known to work.
-	</li><li>Login as an anonymous user: <code>cvs -d:pserver:anonymous@cvs.mesa3d.sourceforge.net:/cvsroot/mesa3d
-	login</code>
-	</li><li>Just hit return at the <code>CVS password:</code> prompt.
-	</li><li>Then checkout mesa: <code>cvs -z3 -d:pserver:anonymous@cvs.mesa3d.sourceforge.net:/cvsroot/mesa3d
-	co Mesa-newtree</code>
-</li></ol>
-
-<p>To update your Mesa CVS source to the latest CVS source:
-
-</p><ol>
-	<li><code>cd Mesa</code>
-	</li><li><code>cvs -z3 -d:pserver:anonymous@cvs.mesa3d.sourceforge.net:/cvsroot/mesa3d
-	update</code>
-</li></ol>
-
-<p>You can browse the Mesa source code in CVS
-<a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/mesa3d/">here.
-</a>
-</p>
-
-</body>
-</html>
diff --git a/docs/news.html b/docs/news.html
index 75c420c08b6..b6520121097 100644
--- a/docs/news.html
+++ b/docs/news.html
@@ -7,6 +7,18 @@
 <H1>News</H1>
 
 
+<h2>December 28, 2003</h2>
+
+<p>
+The Mesa CVS server has been moved to <a href="http://www.freedesktop.org"
+target="_parent">
+freedesktop.org</a> because of problems with SourceForge's anonymous
+CVS service.
+</p>
+
+<p>Please see the <a href="cvs_access.html">CVS access page</a> for details.
+</p>
+
 
 <h2>December 17, 2003</h2>
 
@@ -741,6 +753,6 @@ source code</a>.</p>
 
 
 <hr>
-$Id: news.html,v 3.10 2003/12/18 00:32:05 brianp Exp $
+$Id: news.html,v 3.11 2003/12/31 20:47:37 brianp Exp $
 </body>
 </html>
\ No newline at end of file
