diff --git a/WHATSNEW b/WHATSNEW
index 30883da0e..78540b001 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -142,6 +142,7 @@ Fixed bugs:
 
 Other changes:
 --------------
+* Fixed references to obsoleted CVS web site. Burzilla Report 36854.
 
 * Log fine-grained events at verbose level from JUnit. Bugzilla report 31885.
 
diff --git a/docs/manual/CoreTasks/changelog.html b/docs/manual/CoreTasks/changelog.html
index 794011954..df5e5290c 100644
--- a/docs/manual/CoreTasks/changelog.html
+++ b/docs/manual/CoreTasks/changelog.html
@@ -11,7 +11,7 @@
 <h2><a name="changelog">CvsChangeLog</a></h2>
 <h3>Description</h3>
 <p>Generates an XML-formatted report file of the change logs recorded in a
-<a href="http://www.cvshome.org/" target="_top">CVS</a> repository. </p>
+<a href="http://www.nongnu.org/cvs/" target="_top">CVS</a> repository. </p>
 <p><b>Important:</b> This task needs "cvs" on the path. If it isn't, you will get
 an error (such as error 2 on windows). If <code>&lt;cvs&gt;</code> doesn't work, try to execute cvs.exe
 from the command line in the target directory in which you are working.
diff --git a/docs/manual/CoreTasks/cvs.html b/docs/manual/CoreTasks/cvs.html
index 192e63ae8..b9a0645cc 100644
--- a/docs/manual/CoreTasks/cvs.html
+++ b/docs/manual/CoreTasks/cvs.html
@@ -12,7 +12,7 @@
 <h2><a name="cvs">Cvs</a></h2>
 <h3>Description</h3>
 <p>Handles packages/modules retrieved from a
-<a href="http://www.cvshome.org/" target="_top">CVS</a> repository.</p>
+<a href="http://www.nongnu.org/cvs/" target="_top">CVS</a> repository.</p>
 <p><b>Important:</b> This task needs &quot;<code>cvs</code>&quot; on the path. If it isn't, you will get
 an error (such as error <code>2</code> on windows). If <code>&lt;cvs&gt;</code> doesn't work, try to execute <code>cvs.exe</code>
 from the command line in the target directory in which you are working.
@@ -176,8 +176,8 @@ from the <code>&lt;cvs&gt;</code> element.
 <p>Updates from the head of repository ignoring sticky bits (<code>-A</code>) and creating any new directories as necessary (<code>-d</code>).</p>
 <p>Note: the text of the command is passed to cvs &quot;as-is&quot; so any cvs options should appear
 before the command, and any command options should appear after the command as in the diff example
-above. See <a href="http://www.cvshome.org/docs/manual/cvs-1.11.13/cvs.html" target="_top">the cvs manual</a> for details,
-specifically the <a href="http://www.cvshome.org/docs/manual/cvs-1.11.13/cvs_16.html" target="_top">Guide to CVS commands</a></p>
+above. See <a href="http://ximbiot.com/cvs/wiki/index.php?title=Category:User_Documentation" target="_top">the cvs manual</a> for details,
+specifically the <a href="http://ximbiot.com/cvs/wiki/index.php?title=CVS--Concurrent_Versions_System_v1.12.12.1:_Guide_to_CVS_commands#SEC116" target="_top">Guide to CVS commands</a></p>
 <hr>
 <p align="center">Copyright &copy; 2000-2005 The Apache Software
 Foundation.  All rights Reserved.</p>
diff --git a/docs/manual/CoreTasks/cvstagdiff.html b/docs/manual/CoreTasks/cvstagdiff.html
index bcc08a2c3..f4f6a0f71 100644
--- a/docs/manual/CoreTasks/cvstagdiff.html
+++ b/docs/manual/CoreTasks/cvstagdiff.html
@@ -8,7 +8,7 @@
 <h2><a name="cvstagdiff">CvsTagDiff</a></h2>
 <h3>Description</h3>
 <p>Generates an XML-formatted report file of the changes between two tags or dates recorded in a
-<a href="http://www.cvshome.org/" target="_top">CVS</a> repository. </p>
+<a href="http://www.nongnu.org/cvs/" target="_top">CVS</a> repository. </p>
 <p><b>Important:</b> This task needs "cvs" on the path. If it isn't, you will get
 an error (such as error 2 on windows). If <code>&lt;cvs&gt;</code> doesn't work, try to execute <code>cvs.exe</code>
 from the command line in the target directory in which you are working.
diff --git a/docs/manual/tasksoverview.html b/docs/manual/tasksoverview.html
index b52d8ed22..82f4a19f1 100644
--- a/docs/manual/tasksoverview.html
+++ b/docs/manual/tasksoverview.html
@@ -1136,14 +1136,14 @@ documentation.</p>
   <tr valign="top">
     <td nowrap><a href="CoreTasks/cvs.html">Cvs</a></td>
     <td><p>Handles packages/modules retrieved from a
-     <a href="http://www.cvshome.org/" target="_top">CVS</a>
+     <a href="http://www.nongnu.org/cvs/" target="_top">CVS</a>
      repository.</p></td>
   </tr>
 
   <tr valign="top">
     <td nowrap><a href="CoreTasks/changelog.html">CvsChangeLog</a></td>
     <td><p>Generates an XML report of the changes recorded in a
-     <a href="http://www.cvshome.org/" target="_top">CVS</a>
+     <a href="http://www.nongnu.org/cvs/" target="_top">CVS</a>
      repository.</p></td>
   </tr>
 
@@ -1156,7 +1156,7 @@ documentation.</p>
   <tr valign="top">
     <td nowrap><a href="CoreTasks/cvstagdiff.html">CvsTagDiff</a></td>
     <td><p>Generates an XML-formatted report file of the changes between
-    two tags or dates recorded in a <a href="http://www.cvshome.org/"
+    two tags or dates recorded in a <a href="http://www.nongnu.org/cvs/"
     target="_top">CVS</a> repository.</p></td>
   </tr>