diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in
index 457dcccb6..7511f37b7 100644
--- a/src/doc/Makefile.in
+++ b/src/doc/Makefile.in
@@ -17,7 +17,7 @@ INSTALL_INFO = @INSTALL_INFO@
 mkinstalldirs = $(SHELL) $(top_srcdir)/gc/mkinstalldirs
 INFO_FILES = ecl.$(INFOEXT) ecldev.$(INFOEXT) @CLX_INFO@
 HTML_FILES = index.html license.html lgpl.html news.html benchmark.html \
-	install.html download.html
+	install.html download.html cvs.html
 
 VERSION=@PACKAGE_VERSION@
 
@@ -114,6 +114,8 @@ download.html: $(srcdir)/download.in.html head
 	cat head $(srcdir)/download.in.html $(srcdir)/end | $(FILTER) > $@
 index.html: $(srcdir)/index.in.html head
 	cat head $(srcdir)/index.in.html $(srcdir)/end | $(FILTER) > $@
+cvs.html: $(srcdir)/cvs.in.html head
+	cat head $(srcdir)/cvs.in.html $(srcdir)/end | $(FILTER) > $@
 install.html: $(srcdir)/install.in.html head
 	cat head $(srcdir)/install.in.html $(srcdir)/end | $(FILTER) > $@
 news.html: head
diff --git a/src/doc/cvs.in.html b/src/doc/cvs.in.html
new file mode 100644
index 000000000..b81c93746
--- /dev/null
+++ b/src/doc/cvs.in.html
@@ -0,0 +1,28 @@
+<h2>CVS repository</h2>
+
+<p>Beginning on March, ECL partially moved to the common-lisp.net
+server. If you keep up to date with the latest improvements and fixes of
+the ECL environment, you can use CVS to pull the latest sources from
+there.
+
+<p>If you have a modern version of the CVS program, such as the one
+shipped with Mingw or with any Linux distribution, the command to get
+the development sources is
+<pre>
+# ADDRESS=anonymous@common-lisp.net:/project/ecl/cvsroot
+# cvs -z3 -d :pserver:anonymous:$ADDRESS co ecl
+</pre>
+<p>Additionally you can test ECL with Paul Dietz's ANSI test
+suite. For that you need to download some additional files using
+<pre>
+# cvs -z3 -d :pserver:anonymous:$ADDRESS co ecl-test
+</pre>
+<p>Typing <tt>make</tt> from the top of the <tt>ecl-test</tt>
+directory will download the latest version of the test suite and run
+it using the version of ECL which is available on your machine.
+
+<h2>Browsing CVS</h2>
+
+<p>Additionally you can browse the ECL source code and download
+tarballs using <a
+href="http://common-lisp.net/cgi-bin/viewcvs.cgi/?root=ecl">this address</a>.
diff --git a/src/doc/head b/src/doc/head
index dfde4b177..c21fcdba0 100644
--- a/src/doc/head
+++ b/src/doc/head
@@ -27,7 +27,7 @@
    <tr><td><a href="benchmark.html"><b>Benchmarks</b></a></td></tr>
    <tr><td><a href="download.html"><b>Distribution</b></a></td></tr>
    <tr><td><a href="http://common-lisp.net/cgi-bin/viewcvs.cgi/?cvsroot=ecl"><b>Browse CVS</b></a></td></tr>
-   <tr><td><a href="http://common-lisp.net/faq.shtml"><b>Checkout CVS</b></a></td></tr>
+   <tr><td><a href="cvs.html"><b>Checkout CVS</b></a></td></tr>
    <tr><td><a href="http://lists.sourceforge.net/mailman/listinfo/ecls-list"><b>Mailing list</b></a></td></tr>
    <tr><td><a href="cgi-bin/view"><b>Wiki</b></a></td></tr>
    <tr><td><a href="http://sourceforge.net/export/rss2_projnews.php?group_id=30035&amp;rss_fulltext=1">