diff --git a/en_US.ISO8859-1/articles/problem-reports/article.xml b/en_US.ISO8859-1/articles/problem-reports/article.xml
index ef710e0456..483820cfb2 100644
--- a/en_US.ISO8859-1/articles/problem-reports/article.xml
+++ b/en_US.ISO8859-1/articles/problem-reports/article.xml
@@ -11,7 +11,6 @@
 
     <legalnotice id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
-      &tm-attrib.cvsup;
       &tm-attrib.ibm;
       &tm-attrib.intel;
       &tm-attrib.sparc;
@@ -280,7 +279,7 @@
 	  carefully study the contents of the
 	  <filename>/usr/src/UPDATING</filename> file on your system
 	  or its latest version at
-	  <ulink url="http://www.FreeBSD.org/cgi/cvsweb.cgi/src/UPDATING"></ulink>.
+	  <ulink url="http://svnweb.freebsd.org/base/head/UPDATING?view=log"></ulink>.
 	  (This is vital information
 	  if you are upgrading from one version to
 	  another&mdash;especially if you are upgrading to the
@@ -291,10 +290,10 @@
 	  <filename>/usr/ports/UPDATING</filename> (for individual ports)
 	  or <filename>/usr/ports/CHANGES</filename> (for changes
 	  that affect the entire Ports Collection).
-	  <ulink url="http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/UPDATING"></ulink>
+	  <ulink url="http://svnweb.freebsd.org/ports/head/UPDATING?view=log"></ulink>
 	  and
-	  <ulink url="http://www.FreeBSD.org/cgi/cvsweb.cgi/ports/CHANGES"></ulink>
-	  are also available via CVSweb.</para>
+	  <ulink url="http://svnweb.freebsd.org/ports/head/CHANGES?view=log"></ulink>
+	  are also available via svnweb.</para>
       </listitem>
     </itemizedlist>
   </section>
@@ -374,8 +373,8 @@
 		is a place to put that, see below) and on which architecture.
 		You should include whether you are running from a release
 		(e.g. from a CDROM or download), or from
-		a system maintained by &man.cvsup.1; (and, if so, how
-		recently you updated).  If you are tracking the
+		a system maintained by Subversion (and, if so,
+		what revision number you are at).  If you are tracking the
 		&os.current; branch, that is the very first thing someone
 		will ask, because fixes (especially for high-profile
 		problems) tend to get committed very quickly, and
@@ -587,11 +586,11 @@
 	<option>-c</option> or <option>-u</option> option to
 	&man.diff.1; to create a context or unified diff (unified is
 	preferred), and make
-	sure to specify the exact CVS revision numbers of the files
+	sure to specify the exact SVN revision numbers of the files
 	you modified so the developers who read your report will be
 	able to apply them easily.  For problems with the kernel or the
 	base utilities, a patch against &os.current; (the HEAD
-	CVS branch) is preferred since all new code should be applied
+	Subversion branch) is preferred since all new code should be applied
 	and tested there first.  After appropriate or substantial testing
 	has been done, the code will be merged/migrated to the &os.stable;
 	branch.</para>
@@ -664,8 +663,8 @@
 	  <para><emphasis>Confidential:</emphasis> This is prefilled
 	    to <literal>no</literal>.   Changing it makes no sense as
 	    there is no such thing as a confidential &os; problem
-	    report&mdash;the PR database is distributed worldwide by
-	    <application>CVSup</application>.</para>
+	    report&mdash;the PR database is distributed
+	    worldwide.</para>
 	</listitem>
 
 	<listitem>
@@ -923,7 +922,7 @@
 	  </itemizedlist>
 
 	  <para>Here is the current list of categories (taken from
-	    <ulink url="http://www.FreeBSD.org/cgi/cvsweb.cgi/src/gnu/usr.bin/send-pr/categories"></ulink>):</para>
+	    <ulink url="http://svnweb.freebsd.org/base/head/gnu/usr.bin/send-pr/categories"></ulink>):</para>
 
 	  <itemizedlist>
 	    <listitem>