diff --git a/en_US.ISO8859-1/books/faq/book.sgml b/en_US.ISO8859-1/books/faq/book.sgml
index 156e6fb22b..212433c5d5 100644
--- a/en_US.ISO8859-1/books/faq/book.sgml
+++ b/en_US.ISO8859-1/books/faq/book.sgml
@@ -420,7 +420,7 @@
 	    <listitem>
 	      <para>To preserve a fixed reference point for the code in
 		question, just in case we break something really badly
-		later.  (Although CVS normally prevents anything
+		later.  (Although subversion normally prevents anything
 		horrible like this happening.)</para>
 	    </listitem>
 
@@ -6372,7 +6372,7 @@ options    SYSVMSG          # enable for messaging</programlisting>
 	    6.3-STABLE.</para>
 
 	  <para>For more information on version numbers and the various
-	    CVS branches, refer to the <ulink
+	    subversion branches, refer to the <ulink
 	      url="&url.articles.releng;/article.html">Release Engineering</ulink>
 	    article.</para>
 	</answer>
@@ -10169,7 +10169,7 @@ hint.sio.7.irq="12"</programlisting>
 	<answer>
 	  <para>There are currently four active/semi-active branches in
 	    the &os; <ulink
-	      url="http://www.FreeBSD.org/cgi/cvsweb.cgi">CVS Repository</ulink>.
+	      url="http://svnweb.FreeBSD.org/base/">Subversion Repository</ulink>.
 	    (Earlier branches are only changed very rarely, which is why
 	    there are only four active branches of development):</para>