diff --git a/chapter01/administrativa.xml b/chapter01/administrativa.xml
index 261beb214..07862ed48 100644
--- a/chapter01/administrativa.xml
+++ b/chapter01/administrativa.xml
@@ -64,11 +64,10 @@ url="http://www.linuxfromscratch.org/~matthew/LFS-references.html"/>.</para>
 <sect2 id="ch-scatter-mirrors" xreflabel="Chapter 1 - Mirror sites">
 <title>Mirror Sites</title>
 
-<para>The LFS project has a number of world-wide mirrors to make
-accessing the website and downloading the required packages more
-convenient. Please visit the LFS website at <ulink url="&lfs-root;"/>
-for a list of current mirrors.</para>
-</sect2>
+<para>The LFS project has a number of world-wide mirrors to make accessing the
+website and downloading the required packages more convenient. Please visit the
+LFS website at <ulink url="&lfs-root;mirrors.html"/> for a list of current
+mirrors.</para> </sect2>
 
 <sect2 id="ch-scatter-contactinfo">
 <title>Contact Information</title>
diff --git a/chapter05/gcc-pass2.xml b/chapter05/gcc-pass2.xml
index b5dac5d32..5ddac0851 100644
--- a/chapter05/gcc-pass2.xml
+++ b/chapter05/gcc-pass2.xml
@@ -50,11 +50,11 @@ performing a quick test:</para>
 <screen><computeroutput>The system has no more ptys.  
 Ask your system administrator to create more.</computeroutput></screen>
 
-<para>If the above message is received, the host does not have its
-PTYs set up properly. In this case, there is no point in running the
-test suites for GCC and Binutils until this issue is resolved. Please
-consult the LFS FAQ at <ulink url="&faq-root;"/> for more
-information on how to get PTYs working.</para>
+<para>If the above message is received, the host does not have its PTYs set up
+properly. In this case, there is no point in running the test suites for GCC and
+Binutils until this issue is resolved. Please consult the LFS FAQ at <ulink
+url="&lfs-root;/lfs/faq.html#no-ptys"/> for more information on how to get PTYs
+working.</para>
 
 <para>First correct a known problem and make an essential adjustment:</para>
 
diff --git a/general.ent b/general.ent
index 9390e1c73..9c64fce1d 100644
--- a/general.ent
+++ b/general.ent
@@ -10,15 +10,9 @@
 <!ENTITY hints-root "&lfs-root;hints/downloads/files/">
 <!ENTITY hints-index "&lfs-root;hints/list.html">
 <!ENTITY patches-root "&lfs-root;patches/lfs/&generic-version;/">
-<!ENTITY livecd-root "http://linuxfromscratch.org/~jhuntwork/livecd/">
-<!-- Uncomment these two and remove the last two once
-     the beta site has moved to www.
-
+<!ENTITY livecd-root "&lfs-root;livecd/">
 <!ENTITY test-results "&lfs-root;lfs/build-logs/&generic-version;/">
 <!ENTITY errata "&lfs-root;lfs/errata/&generic-version;/">
--->
-<!ENTITY test-results "http://beta.linuxfromscratch.org/lfs/build-logs/&generic-version;/">
-<!ENTITY errata "http://beta.linuxfromscratch.org/lfs/errata/&generic-version;/">
 
 <!ENTITY buildtime "Approximate build time">
 <!ENTITY diskspace "Required disk space">