Index: BOOK/bootable/x86/kernel.xml
===================================================================
--- BOOK/bootable/x86/kernel.xml	(revision f9e5ac79eb966114c673aa92bd5315539d5313fb)
+++ BOOK/bootable/x86/kernel.xml	(revision 0d4607d28b2ad20303bce044f9de2e45fb560fd0)
@@ -39,8 +39,8 @@
     <para os="h">Configure the kernel via a menu-driven interface.
     Please note that the udev bootscript requires "rtc" and "tmpfs" to be
-    enabled and built into the kernel, not as modules. BLFS has
+    enabled and built into the kernel, not as modules. CBLFS has
     some information regarding particular kernel configuration requirements of
     packages outside of CLFS at <ulink
-    url="&blfs-root;view/svn/longindex.html#kernel-config-index"/>:</para>
+    url="&cblfs-root;"/>:</para>
 
 <screen os="i"><userinput>make menuconfig</userinput></screen>
Index: BOOK/bootscripts/common/symlinks.xml
===================================================================
--- BOOK/bootscripts/common/symlinks.xml	(revision f9e5ac79eb966114c673aa92bd5315539d5313fb)
+++ BOOK/bootscripts/common/symlinks.xml	(revision 0d4607d28b2ad20303bce044f9de2e45fb560fd0)
@@ -100,5 +100,5 @@
     The case of network cards is covered separately in
     <xref linkend="ch-scripts-network"/>, and sound card configuration can
-    be found in <ulink url="&blfs-root;">BLFS</ulink>.</para>
+    be found in <ulink url="&cblfs-root;">CBLFS</ulink>.</para>
 
     <para>For each of your devices that is likely to have this problem
Index: BOOK/final-system/common/inetutils.xml
===================================================================
--- BOOK/final-system/common/inetutils.xml	(revision f9e5ac79eb966114c673aa92bd5315539d5313fb)
+++ BOOK/final-system/common/inetutils.xml	(revision 0d4607d28b2ad20303bce044f9de2e45fb560fd0)
@@ -66,5 +66,5 @@
           <command>whois</command> client, which is out of date.
           Instructions for a better <command>whois</command> client are
-          in the BLFS book.</para>
+          in the CBLFS book.</para>
         </listitem>
       </varlistentry>
@@ -75,10 +75,5 @@
           <para>This disables the installation of the various network
           servers included as part of the Inetutils package. These servers are
-          deemed not appropriate in a basic CLFS system. Some are insecure by
-          nature and are only considered safe on trusted networks. More
-          information can be found at <ulink
-          url="&blfs-root;view/svn/basicnet/inetutils.html"/>. Note that
-          better replacements are available for many of these
-          servers.</para>
+          deemed not appropriate in a basic CLFS system.</para>
         </listitem>
       </varlistentry>
Index: BOOK/final-system/common/iproute2.xml
===================================================================
--- BOOK/final-system/common/iproute2.xml	(revision f9e5ac79eb966114c673aa92bd5315539d5313fb)
+++ BOOK/final-system/common/iproute2.xml	(revision 0d4607d28b2ad20303bce044f9de2e45fb560fd0)
@@ -32,5 +32,5 @@
     If the <command>arpd</command> binary is needed, instructions for
     compiling Berkeley DB can be found in the BLFS Book at <ulink
-    url="&blfs-root;view/svn/server/databases.html#db"/>.</para>
+    url="&cblfs-root;index.php/Berkeley_DB"/>.</para>
 
 <screen os="s2"><userinput>sed -i '/^TARGETS/s@arpd@@g' misc/Makefile</userinput></screen>
Index: BOOK/final-system/common/man.xml
===================================================================
--- BOOK/final-system/common/man.xml	(revision f9e5ac79eb966114c673aa92bd5315539d5313fb)
+++ BOOK/final-system/common/man.xml	(revision 0d4607d28b2ad20303bce044f9de2e45fb560fd0)
@@ -108,8 +108,4 @@
     not support multibyte character sets.</para>
 
-    <para os="u">Additional information with regards to the compression of
-    man and info pages can be found in the BLFS book at
-    <ulink url="&blfs-root;view/svn/postlfs/compressdoc.html"/>.</para>
-
   </sect2>
 
Index: BOOK/final-system/common/shadow.xml
===================================================================
--- BOOK/final-system/common/shadow.xml	(revision f9e5ac79eb966114c673aa92bd5315539d5313fb)
+++ BOOK/final-system/common/shadow.xml	(revision 0d4607d28b2ad20303bce044f9de2e45fb560fd0)
@@ -28,5 +28,5 @@
     <note os="a">
       <para>If you would like to enforce the use of strong passwords,
-      refer to <ulink url="&blfs-root;view/svn/postlfs/cracklib.html"/>
+      refer to <ulink url="&cblfs-root;index.php/Cracklib"/>
       for installing Cracklib prior to building Shadow. Then add
       <parameter>--with-libcrack</parameter> to the <command>configure</command>
@@ -53,5 +53,5 @@
       disables PAM support in Shadow. For instructions to install PAM and
       link Shadow to it, you can look at
-      <ulink url="&blfs-root;view/svn/postlfs/shadow.html"/>.</para></listitem>
+      <ulink url="&clfs-root;index.php/Shadow"/>.</para></listitem>
     </varlistentry>
     <varlistentry>
@@ -153,5 +153,5 @@
     you create, you can edit <filename>/etc/default/useradd</filename>. See
     <command>man useradd</command> or
-    <ulink url="&blfs-root;view/svn/postlfs/skel.html"/> for more
+    <ulink url="&cblfs-root;ndex.php/Configuring_for_Adding_Users"/> for more
     information.</para>
 
Index: BOOK/final-system/common/vim.xml
===================================================================
--- BOOK/final-system/common/vim.xml	(revision f9e5ac79eb966114c673aa92bd5315539d5313fb)
+++ BOOK/final-system/common/vim.xml	(revision 0d4607d28b2ad20303bce044f9de2e45fb560fd0)
@@ -25,5 +25,5 @@
       <para>If you prefer another editor&mdash;such as Emacs, Joe, or
       Nano&mdash;please refer to <ulink
-      url="&blfs-root;view/svn/postlfs/editors.html"/>
+      url="&cblfs-root;index.php/Vim"/>
       for suggested installation instructions.</para>
     </tip>
@@ -105,6 +105,6 @@
     additional libraries to be installed. For more information, refer to the
     Vim documentation and the Vim installation page
-    in the BLFS book at <ulink
-    url="&blfs-root;view/svn/postlfs/editors.html#postlfs-editors-vim"/>.</para>
+    in the CBLFS book at <ulink
+    url="&cblfs-root;index.php/Vim"/>.</para>
 
   </sect2>
@@ -376,5 +376,5 @@
           necessary to highlight in <command>vim</command>. This script
           requires the old Unix <command>spell</command> command, which
-          is provided neither in CLFS nor in BLFS</para>
+          is provided neither in CLFS nor in CBLFS</para>
           <indexterm zone="ch-system-vim vimspell.sh">
             <primary sortas="b-vimspell.sh">vimspell.sh</primary>
Index: BOOK/general.ent
===================================================================
--- BOOK/general.ent	(revision f9e5ac79eb966114c673aa92bd5315539d5313fb)
+++ BOOK/general.ent	(revision 0d4607d28b2ad20303bce044f9de2e45fb560fd0)
@@ -33,8 +33,6 @@
 <!ENTITY clfs-wiki "http://trac.cross-lfs.org/">
 <!ENTITY cblfs-root "http://cblfs.cross-lfs.org/">
-<!ENTITY blfs-root "&lfs-root;blfs/">
 <!ENTITY faq-root "&clfs-wiki;wiki/faq">
-<!ENTITY hints-root "&lfs-root;hints/downloads/files/">
-<!ENTITY hints-index "&lfs-root;hints/list.html">
+<!ENTITY hints-root "http://hints.cross-lfs.org/">
 <!ENTITY livecd-root "&lfs-root;livecd/">
 <!ENTITY test-results "&clfs-wiki;clfs/build-logs/&generic-version;/">
Index: BOOK/partitioning/common/creatingfilesystem.xml
===================================================================
--- BOOK/partitioning/common/creatingfilesystem.xml	(revision f9e5ac79eb966114c673aa92bd5315539d5313fb)
+++ BOOK/partitioning/common/creatingfilesystem.xml	(revision 0d4607d28b2ad20303bce044f9de2e45fb560fd0)
@@ -17,5 +17,5 @@
   an <systemitem class="filesystem">ext2</systemitem> file system.
   Instructions for other file systems can be found at
-  <ulink url="&blfs-root;view/svn/postlfs/filesystems.html"/>.</para>
+  <ulink url="&cblfs-root;index.php?section=6#File_System_.2F_Block_Device_.2F_Inode_Management_Tools"/>.</para>
 
   <para os="b">To create an <systemitem class="filesystem">ext2</systemitem> file
Index: BOOK/the-end/whatnow.xml
===================================================================
--- BOOK/the-end/whatnow.xml	(revision f9e5ac79eb966114c673aa92bd5315539d5313fb)
+++ BOOK/the-end/whatnow.xml	(revision 0d4607d28b2ad20303bce044f9de2e45fb560fd0)
@@ -73,17 +73,9 @@
 
     <listitem>
-      <para>Beyond Linux From Scratch</para>
+      <para>CLFS Hints</para>
 
-      <para>The Beyond Linux From Scratch book covers installation
-      procedures for a wide range of software beyond the scope of the CLFS
-      Book. The BLFS project is located at <ulink url="&blfs-root;"/>.</para>
-    </listitem>
-
-    <listitem>
-      <para>LFS Hints</para>
-
-      <para>The LFS Hints are a collection of educational documents
-      submitted by volunteers in the LFS community. The hints are available
-      at <ulink url="&hints-index;"/>.</para>
+      <para>The CLFS Hints are a collection of educational documents
+      submitted by volunteers in the CLFS community. The hints are available
+      at <ulink url="&hints-root;"/>.</para>
     </listitem>
 
