diff --git a/docs/building.html b/docs/building.html
index 90fd1c869..94660f8cc 100644
--- a/docs/building.html
+++ b/docs/building.html
@@ -24,7 +24,7 @@
 <ul class="simple">
 <li><a class="reference" href="#downloading-and-building" id="id8" name="id8">downloading and building</a><ul>
 <li><a class="reference" href="#contributed-build-tutorials" id="id9" name="id9">Contributed build tutorials</a></li>
-<li><a class="reference" href="#building-from-cvs" id="id10" name="id10">building from cvs</a></li>
+<li><a class="reference" href="#building-from-svn" id="id10" name="id10">building from svn</a></li>
 <li><a class="reference" href="#building-with-bbv2" id="id11" name="id11">building with BBv2</a></li>
 <li><a class="reference" href="#building-with-autotools" id="id12" name="id12">building with autotools</a></li>
 <li><a class="reference" href="#building-with-other-build-systems" id="id13" name="id13">building with other build systems</a></li>
@@ -35,8 +35,8 @@
 </div>
 <div class="section">
 <h1><a id="downloading-and-building" name="downloading-and-building">downloading and building</a></h1>
-<p>To acquire the latest version of libtorrent, you'll have to grab it from CVS.
-You'll find instructions on how to do this <a class="reference" href="http://sourceforge.net/cvs/?group_id=79942">here</a> (see Anonymous CVS access).</p>
+<p>To acquire the latest version of libtorrent, you'll have to grab it from SVN.
+You'll find instructions on how to do this <a class="reference" href="http://sourceforge.net/svn/?group_id=79942">here</a> (see subversion access).</p>
 <p>The build systems supported &quot;out of the box&quot; in libtorrent are boost-build v2
 (BBv2) and autotools (for unix-like systems). If you still can't build after
 following these instructions, you can usually get help in the <tt class="docutils literal"><span class="pre">#libtorrent</span></tt>
@@ -44,7 +44,7 @@ IRC channel on <tt class="docutils literal"><span class="pre">irc.freenode.net</
 <div class="section">
 <h2><a id="contributed-build-tutorials" name="contributed-build-tutorials">Contributed build tutorials</a></h2>
 <ul class="simple">
-<li>libtorrent cvs, <a class="reference" href="ubuntu_build_notes.html">ubuntu</a></li>
+<li>libtorrent svn, <a class="reference" href="ubuntu_build_notes.html">ubuntu</a></li>
 <li><a class="reference" href="ubuntu_6_build_notes.html">ubuntu 6.10</a></li>
 <li><a class="reference" href="suse_build_notes.html">suse</a></li>
 <li><a class="reference" href="vs2005_build_notes.html">visual studio 2005</a></li>
@@ -54,13 +54,13 @@ IRC channel on <tt class="docutils literal"><span class="pre">irc.freenode.net</
 Gentoo ebuild is provided by the <a class="reference" href="http://www.peerweb.nl/gentoo/net-libs/rblibtorrent/">BTG project</a>.</p>
 </div>
 <div class="section">
-<h2><a id="building-from-cvs" name="building-from-cvs">building from cvs</a></h2>
-<p>To build libtorrent from cvs you need to check out the libtorrent sources from
+<h2><a id="building-from-svn" name="building-from-svn">building from svn</a></h2>
+<p>To build libtorrent from svn you need to check out the libtorrent sources from
 sourceforge and also check out the asio sources from its sourceforge cvs.
 If you downloaded a release tarball, you can skip this section.</p>
 <p>To prepare the directory structure for building, follow these steps:</p>
 <ul class="simple">
-<li>Check out libtorrent (<a class="reference" href="http://sourceforge.net/cvs/?group_id=79942">instructions</a>).</li>
+<li>Check out libtorrent (<a class="reference" href="http://sourceforge.net/svn/?group_id=79942">instructions</a>).</li>
 <li>Check out asio (<a class="reference" href="http://sourceforge.net/cvs/?group_id=122478">instructions</a>).</li>
 <li>Copy the <tt class="docutils literal"><span class="pre">asio/include/asio/</span></tt> directory into the <tt class="docutils literal"><span class="pre">libtorrent/include/libtorrent/</span></tt>
 directory. Alternatively you can make a symbolic link.</li>
diff --git a/docs/building.rst b/docs/building.rst
index 2beaa62f4..270e2aa9f 100644
--- a/docs/building.rst
+++ b/docs/building.rst
@@ -11,10 +11,10 @@ libtorrent manual
 downloading and building
 ========================
 
-To acquire the latest version of libtorrent, you'll have to grab it from CVS.
-You'll find instructions on how to do this here__ (see Anonymous CVS access).
+To acquire the latest version of libtorrent, you'll have to grab it from SVN.
+You'll find instructions on how to do this here__ (see subversion access).
 
-__ http://sourceforge.net/cvs/?group_id=79942
+__ http://sourceforge.net/svn/?group_id=79942
 
 The build systems supported "out of the box" in libtorrent are boost-build v2
 (BBv2) and autotools (for unix-like systems). If you still can't build after
@@ -24,7 +24,7 @@ IRC channel on ``irc.freenode.net``.
 Contributed build tutorials
 ---------------------------
 
-* libtorrent cvs, ubuntu_
+* libtorrent svn, ubuntu_
 * `ubuntu 6.10`_
 * suse_
 * `visual studio 2005`_
@@ -41,10 +41,10 @@ Gentoo ebuild is provided by the `BTG project`_.
 
 .. _`BTG project`: http://www.peerweb.nl/gentoo/net-libs/rblibtorrent/
 
-building from cvs
+building from svn
 -----------------
 
-To build libtorrent from cvs you need to check out the libtorrent sources from
+To build libtorrent from svn you need to check out the libtorrent sources from
 sourceforge and also check out the asio sources from its sourceforge cvs.
 If you downloaded a release tarball, you can skip this section.
 
@@ -56,7 +56,7 @@ To prepare the directory structure for building, follow these steps:
   directory. Alternatively you can make a symbolic link.
 * Copy ``asio/include/asio.hpp`` into ``libtorrent/include/libtorrent``.
 
-__ http://sourceforge.net/cvs/?group_id=79942
+__ http://sourceforge.net/svn/?group_id=79942
 __ http://sourceforge.net/cvs/?group_id=122478
 
 Now the libtorrent directory is ready for building. Follow the steps in one
diff --git a/docs/index.html b/docs/index.html
index 53d5ad1d3..17f4348db 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -20,8 +20,9 @@
 <li><a class="reference" href="client_test.png">screenshot</a></li>
 <li><a class="reference" href="http://lists.sourceforge.net/lists/listinfo/libtorrent-discuss">mailing list</a> (<a class="reference" href="http://dir.gmane.org/gmane.network.bit-torrent.libtorrent">archive</a>)</li>
 <li><a class="reference" href="projects.html">who's using libtorrent?</a></li>
-<li><a class="reference" href="http://sourceforge.net/tracker/?group_id=79942&amp;atid=558250">report bugs</a></li>
+<li><a class="reference" href="http://code.rasterbar.com/libtorrent/newticket">report bugs</a></li>
 <li><a class="reference" href="http://www.sourceforge.net/projects/libtorrent">sourceforge page</a></li>
+<li><a class="reference" href="http://code.rasterbar.com/libtorrent">wiki</a></li>
 </ul>
 <hr class="docutils" />
 <p>Extensions</p>
diff --git a/docs/index.rst b/docs/index.rst
index 780f78991..38330a01d 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -12,6 +12,7 @@
 * `who's using libtorrent?`_
 * `report bugs`_
 * `sourceforge page`_
+* `wiki`_
 
 --------
 
@@ -59,8 +60,9 @@ libtorrent
 .. _mailing list: http://lists.sourceforge.net/lists/listinfo/libtorrent-discuss
 .. _archive: http://dir.gmane.org/gmane.network.bit-torrent.libtorrent
 .. _`who's using libtorrent?`: projects.html
-.. _`report bugs`: http://sourceforge.net/tracker/?group_id=79942&atid=558250
+.. _`report bugs`: http://code.rasterbar.com/libtorrent/newticket
 .. _sourceforge page: http://www.sourceforge.net/projects/libtorrent
+.. _wiki: http://code.rasterbar.com/libtorrent
 
 .. _`ruby bindings`: http://libtorrent-ruby.rubyforge.org/
 .. _`python bindings`: python_binding.html