Index: general.ent
===================================================================
--- general.ent	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ general.ent	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -20,13 +20,12 @@
 
 <!ENTITY lfs-website          "http://www.&lfs-domainname;">
-<!-- downloads - root must not have an entity because it is needed for scripts
+<!-- downloads-root must not have an entity because it is needed for scripts
      change svn to x.y for release -->
 <!ENTITY downloads-root       "http://www.linuxfromscratch.org/blfs/downloads/svn">
 <!ENTITY downloads-project    "http://downloads.&lfs-domainname;">
-<!ENTITY sources-anduin-http  "http://anduin.&lfs-domainname;/sources/BLFS/svn">
-<!ENTITY sources-anduin-ftp   "ftp://anduin.&lfs-domainname;/BLFS/svn">
-<!ENTITY sources-anduin-other-http "http://anduin.&lfs-domainname;/sources/other">
-<!ENTITY sources-anduin-other "ftp://anduin.&lfs-domainname;/other">
-<!ENTITY files-anduin         "http://anduin.&lfs-domainname;/files/BLFS/svn">
+
+<!ENTITY sources-anduin-http  "http://anduin.linuxfromscratch.org/BLFS">
+<!ENTITY sources-anduin-ftp   "ftp://anduin.linuxfromscratch.org/BLFS">
+
 <!ENTITY hints-root           "http://www.&lfs-domainname;/hints">
 <!ENTITY patch-downloads      "http://www.linuxfromscratch.org/patches/downloads">
@@ -34,5 +33,5 @@
 <!ENTITY errata               "http://www.&lfs-domainname;/blfs/errata/&blfs-version;/">
 <!ENTITY blfs-ticket-root     "http://wiki.&lfs-domainname;/blfs/ticket/">
-<!-- <!ENTITY lfs-root             "http://www.&lfs-domainname;/lfs/view/&lfs-version;"> -->
+
 <!ENTITY lfs-root             "../../../../lfs/view/&lfs-version;">
 <!ENTITY lfs-dev              "../../../../lfs/view/development">
@@ -78,5 +77,4 @@
 
 <!ENTITY blfs-bootscripts-version     "20150924">
-<!ENTITY blfs-bootscripts-download    "&downloads-root;/blfs-bootscripts-&blfs-bootscripts-version;.tar.bz2">
 
 <!ENTITY blfs-wiki                    "http://wiki.&lfs-domainname;/blfs/wiki">
Index: general/genlib/popt.xml
===================================================================
--- general/genlib/popt.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ general/genlib/popt.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -6,5 +6,5 @@
 
   <!ENTITY popt-download-http "http://rpm5.org/files/popt/popt-&popt-version;.tar.gz">
-  <!ENTITY popt-download-ftp  "&sources-anduin-ftp;/p/popt-&popt-version;.tar.gz">
+  <!ENTITY popt-download-ftp  "&sources-anduin-ftp;/popt/popt-&popt-version;.tar.gz">
   <!ENTITY popt-md5sum        "3743beefa3dd6247a73f8f7a32c14c33">
   <!ENTITY popt-size          "702 kB">
Index: general/genutils/imagemagick.xml
===================================================================
--- general/genutils/imagemagick.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ general/genutils/imagemagick.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -88,5 +88,5 @@
         at <literal>ftp.ImageMagick.org/pub/ImageMagick</literal> you can download it
         from the BLFS package server at <ulink
-        url="&sources-anduin-http;/i/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz"/>.
+        url="&sources-anduin-http;/ImageMagick/ImageMagick-&imagemagick-version;-&imagemagick-patch-version;.tar.xz"/>.
       </para>
     </note>
Index: general/genutils/tidy.xml
===================================================================
--- general/genutils/tidy.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ general/genutils/tidy.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY tidy-download-http "&sources-anduin-http;/t/tidy-&tidy-version;.tar.bz2">
+  <!ENTITY tidy-download-http "&sources-anduin-http;/tidy/tidy-&tidy-version;.tar.bz2">
   <!ENTITY tidy-download-ftp  " ">
   <!ENTITY tidy-md5sum        "dd1fe109b4259ad3f364b175787ad5e9">
Index: general/prog/apache-ant.xml
===================================================================
--- general/prog/apache-ant.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ general/prog/apache-ant.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -69,6 +69,6 @@
         <para>
           Required file: <ulink
-             url="http://anduin.linuxfromscratch.org/sources/other/junit-&junit-version;.jar">
-                  http://anduin.linuxfromscratch.org/sources/other/junit-&junit-version;.jar</ulink>
+             url="&sources-anduin-http;/other/junit-&junit-version;.jar">
+                  &sources-anduin-http;/other/junit-&junit-version;.jar</ulink>
         </para>
       </listitem>
Index: general/prog/java.xml
===================================================================
--- general/prog/java.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ general/prog/java.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY anduin-download             "http://anduin.linuxfromscratch.org/files/BLFS/OpenJDK-&openjdk-version;">
+  <!ENTITY anduin-download             "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
   <!ENTITY openjdk-download-binary-x86 "&anduin-download;/OpenJDK-&openjdk-version;-i686-bin.tar.xz">
   <!ENTITY openjdk-bin-md5sum-x86      "38296c3c879afde561726fa8505016f1">
Index: general/prog/openjdk.xml
===================================================================
--- general/prog/openjdk.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ general/prog/openjdk.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -11,5 +11,5 @@
   <!ENTITY ojdk-download             "&ojdk-repo;/archive/&ojdk-tarball;">
 
-  <!ENTITY anduin-download           "http://anduin.linuxfromscratch.org/files/BLFS/OpenJDK-&openjdk-version;">
+  <!ENTITY anduin-download           "&sources-anduin-http;/OpenJDK/OpenJDK-&openjdk-version;">
 
   <!ENTITY ojdk-md5sum               "bcaf6f51627e8f052eff0fdcd8578b4f">
Index: general/prog/perl-modules.xml
===================================================================
--- general/prog/perl-modules.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ general/prog/perl-modules.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -5,6 +5,4 @@
   %general-entities;
 
-  <!ENTITY perl_modules_md5sums_download_http "&sources-anduin-http;/perl-modules/">
-  <!ENTITY perl_modules_md5sums_download_ftp  "&sources-anduin-ftp;/perl-modules/">
   <!ENTITY perl_authors  "http://cpan.metacpan.org/authors">
 
@@ -75,5 +73,5 @@
   <!ENTITY Regexp-Common-md5sum "2b9c335312dcfd9980ff7acbad0e5905">
 
-  <!ENTITY SGMLSpm-download-http "http://anduin.&lfs-domainname;/sources/BLFS/conglomeration/perl-modules/SGMLSpm-&SGMLSpm-version;.tar.gz">
+  <!ENTITY SGMLSpm-download-http "&sources-anduin-http;/perl-modules/SGMLSpm-&SGMLSpm-version;.tar.gz">
   <!ENTITY SGMLSpm-md5sum "746c74ae969992cedb1a2879b4168090">
 
@@ -158,15 +156,4 @@
     allow more tests to be run, but omitting them will still allow the tests
     to <literal>PASS</literal>.</para>
-
-    <!-- <itemizedlist spacing="compact">
-      <listitem>
-        <para>Download MD5 sums (HTTP):
-        <ulink url="&perl_modules_md5sums_download_http-download-http;"/></para>
-      </listitem>
-      <listitem>
-        <para>Download MD5 sums (FTP):
-        <ulink url="&perl_modules_md5sums_download_ftp-download-http;"/></para>
-      </listitem>
-    </itemizedlist> -->
 
     <!-- Archive::Zip -->
Index: general/prog/php.xml
===================================================================
--- general/prog/php.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ general/prog/php.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -193,5 +193,5 @@
         of a <command>configure</command> command that utilizes many of the
         most common dependencies can be found at <ulink
-        url="&files-anduin;/php_configure.txt"/>.
+        url="&sources-anduin-http;/files/php_configure.txt"/>.
       </para>
 
Index: introduction/important/bootscripts.xml
===================================================================
--- introduction/important/bootscripts.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ introduction/important/bootscripts.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -34,5 +34,5 @@
     <title>Package Information</title>
     <listitem>
-      <para>Download: <ulink url="&blfs-bootscripts-download;"/></para>
+      <para>Download: <ulink url="&sources-anduin-http;/blfs-bootscripts"/></para>
     </listitem>
   </itemizedlist>
@@ -59,5 +59,5 @@
     new packages or to make minor corrections.  All versions of the 
     bootscripts are located at <ulink 
-    url="http://anduin.linuxfromscratch.org/sources/BLFS/conglomeration/blfs-bootscripts/"/>.</para>
+    url="&sources-anduin-http;/blfs-bootscripts/"/>.</para>
   </note>
 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ introduction/welcome/changelog.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -49,4 +49,7 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update locations of files hosted on anduin.</para>
+        </listitem>
+        <listitem>
           <para>[igor] - Update to mesa-11.0.3. Fixes
           <ulink url="&blfs-ticket-root;7006">#7006</ulink>.</para>
Index: kde/libdbusmenuqt.xml
===================================================================
--- kde/libdbusmenuqt.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ kde/libdbusmenuqt.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY libdbusmenu-qt-download-http "http://anduin.linuxfromscratch.org/sources/other/libdbusmenu-qt-&libdbusmenu-qt-version;.tar.xz">
+  <!ENTITY libdbusmenu-qt-download-http "&sources-anduin-http;/other/libdbusmenu-qt-&libdbusmenu-qt-version;.tar.xz">
   <!ENTITY libdbusmenu-qt-download-ftp  " ">
   <!ENTITY libdbusmenu-qt-md5sum        "d21a1f5569e0bc9c9245b4f71761c62f">
Index: lxqt/apps/juffed.xml
===================================================================
--- lxqt/apps/juffed.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ lxqt/apps/juffed.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY juffed-download-http "http://anduin.linuxfromscratch.org/sources/BLFS/conglomeration/juffed/juffed-&juffed-version;.tar.xz">
+  <!ENTITY juffed-download-http "&sources-anduin-http;/juffed/juffed-&juffed-version;.tar.xz">
   <!ENTITY juffed-download-ftp  " ">
   <!ENTITY juffed-md5sum        "5d211f5aadcb3d7365b5a6127d3d275f">
Index: lxqt/apps/obconf-qt.xml
===================================================================
--- lxqt/apps/obconf-qt.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ lxqt/apps/obconf-qt.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY obconf-qt-download-http "&sources-anduin-other-http;/obconf-qt-&obconf-qt-version;.tar.xz">
+  <!ENTITY obconf-qt-download-http "&sources-anduin-http;/other/obconf-qt-&obconf-qt-version;.tar.xz">
   <!ENTITY obconf-qt-download-ftp  " ">
   <!ENTITY obconf-qt-md5sum        "dc0b9515fec3cf81cf809192e75daa3f">
Index: lxqt/apps/qupzilla.xml
===================================================================
--- lxqt/apps/qupzilla.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ lxqt/apps/qupzilla.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY qupzilla-download-http "http://anduin.linuxfromscratch.org/sources/BLFS/conglomeration/qupzilla/qupzilla-&qupzilla-version;.tar.gz">
+  <!ENTITY qupzilla-download-http "&sources-anduin-http;/qupzilla/qupzilla-&qupzilla-version;.tar.gz">
   <!ENTITY qupzilla-download-ftp  " ">
   <!ENTITY qupzilla-md5sum        "24c4033cbf20223eb73a33af9c037862">
Index: multimedia/libdriv/libass.xml
===================================================================
--- multimedia/libdriv/libass.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ multimedia/libdriv/libass.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -5,6 +5,5 @@
   %general-entities;
 
-<!--  <!ENTITY libass-download-http "http://libass.googlecode.com/files/libass-&libass-version;.tar.xz">-->
-  <!ENTITY libass-download-http "http://anduin.linuxfromscratch.org/sources/other/libass-&libass-version;.tar.gz">
+  <!ENTITY libass-download-http "&sources-anduin-http;/other/libass-&libass-version;.tar.gz">
   <!ENTITY libass-download-ftp  " ">
   <!ENTITY libass-md5sum        "1b53e739ab389335ce46fd626777ec61">
Index: multimedia/libdriv/libvpx.xml
===================================================================
--- multimedia/libdriv/libvpx.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ multimedia/libdriv/libvpx.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -5,5 +5,4 @@
   %general-entities;
 
-<!--  <!ENTITY libvpx-download-http "&sources-anduin-other-http;/libvpx-v&libvpx-version;.tar.xz"> -->
   <!ENTITY libvpx-download-http "http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-&libvpx-version;.tar.bz2">
   <!ENTITY libvpx-download-ftp  " ">
Index: multimedia/videoutils/mplayer.xml
===================================================================
--- multimedia/videoutils/mplayer.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ multimedia/videoutils/mplayer.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -7,5 +7,5 @@
 <!--  <!ENTITY mplayer-download-http "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-&mplayer-version;.tar.xz">
   <!ENTITY mplayer-download-ftp "ftp://ftp.mplayerhq.hu/MPlayer/releases/MPlayer-&mplayer-version;.tar.xz">-->
-  <!ENTITY mplayer-download-http "&sources-anduin-other-http;/mplayer-&mplayer-version;.tar.xz">
+  <!ENTITY mplayer-download-http "&sources-anduin-http;/other/mplayer-&mplayer-version;.tar.xz">
   <!ENTITY mplayer-download-ftp " ">
   <!ENTITY mplayer-md5sum        "db598c845fcc12c917c4cca0d76276e7">
Index: networking/netprogs/net-tools.xml
===================================================================
--- networking/netprogs/net-tools.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ networking/netprogs/net-tools.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY net-tools-download-http "&sources-anduin-http;/n/net-tools-&net-tools-version;.tar.gz">
-  <!ENTITY net-tools-download-ftp  "&sources-anduin-ftp;/n/net-tools-&net-tools-version;.tar.gz">
+  <!ENTITY net-tools-download-http "&sources-anduin-http;/net-tools/net-tools-&net-tools-version;.tar.gz">
+  <!ENTITY net-tools-download-ftp  "&sources-anduin-ftp;/net-tools/net-tools-&net-tools-version;.tar.gz">
   <!ENTITY net-tools-md5sum        "6be14ed473cacdd68edeaa9605adc469">
   <!ENTITY net-tools-size          "222 KB">
Index: postlfs/config/firmware.xml
===================================================================
--- postlfs/config/firmware.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ postlfs/config/firmware.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -34,5 +34,5 @@
   these firmware files can be accessed via <userinput>wget</userinput> or a web
   browser at <ulink
-  url="http://anduin.linuxfromscratch.org/sources/linux-firmware/"/>.</para>
+  url="&sources-anduin-http;/linux-firmware/"/>.</para>
   
   <para>To get the firmware, either point a browser to one of the above
@@ -210,5 +210,5 @@
       <para>Begin by downloading a container of firmware for your CPU family
       from <ulink
-      url='http://anduin.linuxfromscratch.org/sources/linux-firmware/amd-ucode/'/>.
+      url='&sources-anduin-http;/linux-firmware/amd-ucode/'/>.
       The family is always specified in hex. Families 10h to 14h (16 to 20)
       are in microcode_amd.bin.  Families 15h and 16h have their own containers.
Index: postlfs/filesystems/xfsprogs.xml
===================================================================
--- postlfs/filesystems/xfsprogs.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ postlfs/filesystems/xfsprogs.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -5,5 +5,4 @@
   %general-entities;
 
-<!--  <!ENTITY xfsprogs-download-http "&sources-anduin-http;/x/xfsprogs-&xfsprogs-version;.tar.gz">-->
   <!ENTITY xfsprogs-download-http " ">
   <!ENTITY xfsprogs-download-ftp  "ftp://oss.sgi.com/projects/xfs/cmd_tars/xfsprogs-&xfsprogs-version;.tar.gz">
Index: postlfs/security/cacerts.xml
===================================================================
--- postlfs/security/cacerts.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ postlfs/security/cacerts.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -7,5 +7,5 @@
   <!ENTITY certhost              "http://mxr.mozilla.org">
   <!ENTITY certdir               "/mozilla/source/security/nss/lib/ckfw/builtins">
-  <!ENTITY ca-bundle-download    "&sources-anduin-other-http;/certdata.txt">
+  <!ENTITY ca-bundle-download    "&sources-anduin-http;/other/certdata.txt">
   <!ENTITY ca-bundle-size        "1.6 MB">
   <!ENTITY cacerts-buildsize     "6 MB">
@@ -310,5 +310,5 @@
    necessary to update the CA Certificates.</para>
 
-   <screen><userinput>URL=&sources-anduin-other-http;/certdata.txt &amp;&amp;
+   <screen><userinput>URL=&sources-anduin-http;/other/certdata.txt &amp;&amp;
 rm -f certdata.txt &amp;&amp;
 wget $URL          &amp;&amp;
Index: pst/ps/a2ps.xml
===================================================================
--- pst/ps/a2ps.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ pst/ps/a2ps.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -75,5 +75,5 @@
       <listitem>
         <para>International fonts: <ulink
-        url="http://anduin.linuxfromscratch.org/sources/BLFS/conglomeration/i18n-fonts/i18n-fonts-&i18n-fonts-version;.tar.bz2"/></para>
+        url="&sources-anduin-http;/i18n-fonts/i18n-fonts-&i18n-fonts-version;.tar.bz2"/></para>
       </listitem>
     </itemizedlist>
Index: pst/ps/epdfview.xml
===================================================================
--- pst/ps/epdfview.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ pst/ps/epdfview.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -5,6 +5,5 @@
   %general-entities;
 
-  <!ENTITY epdfview-download-http
-  "http://anduin.linuxfromscratch.org/sources/BLFS/conglomeration/epdfview/epdfview-&epdfview-version;.tar.bz2">
+  <!ENTITY epdfview-download-http "&sources-anduin-http;/epdfview/epdfview-&epdfview-version;.tar.bz2">
   <!ENTITY epdfview-download-ftp  " ">
   <!ENTITY epdfview-md5sum        "e50285b01612169b2594fea375f53ae4">
Index: pst/scanning/sane.xml
===================================================================
--- pst/scanning/sane.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ pst/scanning/sane.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -5,9 +5,6 @@
   %general-entities;
 
-  <!-- <!ENTITY sane-be-download-http "http://alioth.debian.org/frs/?group_id=30186"> -->
   <!ENTITY sane-be-download-http "http://fossies.org/linux/misc//sane-backends-&sane-version;.tar.gz">
   <!ENTITY sane-be-download-ftp  " ">
-  <!--<!ENTITY sane-be-download-ftp  "ftp://ftp2.sane-project.org/pub/sane/sane-backends-&sane-version;.tar.gz">-->
-  <!--<!ENTITY sane-be-download-ftp  "&gentoo-ftp-repo;/sane-backends-&sane-version;.tar.gz">-->
   <!ENTITY sane-be-md5sum        "1ca68e536cd7c1852322822f5f6ac3a4">
   <!ENTITY sane-be-size          "5.6 MB">
@@ -52,26 +49,4 @@
 
     &lfs78_checked;
-
-    <!-- The upstream web site has the md5sums for the tarballs:
-         http://www.sane-project.org/sane-md5sums.txt.
-         But they do not provide the tarballs, so, the following paragraph
-         seems not applicable, starting with sane-backends-1.0.24.tar.gz.
-
-         This note is not applicable. First, there is no issue downloading the
-         ftp://ftp2.sane-project.org/pub/sane/sane-backends-1.0.23.tar.gz
-         tarball with wget. Next, the combined tarball exists on the SANE FTP
-         site, but the MD5sum is wrong. We can simply point the download to
-         the SANE FTP site and create our own MD5sum (as we do on many packages).
-
-    <note><para>The upstream web site uses a self signed security
-    certificate.  If using <command>wget</command>, the option -no-check-certificate
-    needs to be added.</para>
-
-    <para>The md5sum of the backend file does not match unless the three parts
-    of the divided tarball on the upstream server,
-    sane-backends-1.0.23.tar.gz.[1-3], are combined.  A combined tarball with
-    the correct md5sum is located at <ulink
-    url="http://anduin.linuxfromscratch.org/sources/other/sane-backends-1.0.23.tar.gz">http://anduin.linuxfromscratch.org/sources/other/sane-backends-1.0.23.tar.gz</ulink>.</para></note>
-    -->
 
     <bridgehead renderas="sect3">Back Ends Package Information</bridgehead>
Index: server/databases/db.xml
===================================================================
--- server/databases/db.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ server/databases/db.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -149,26 +149,4 @@
   <sect2 role="installation" id="bdb-installation">
     <title>Installation of Berkeley DB</title>
-
-    <!-- <note>
-      <para>
-        If you plan on installing <application>Berkeley DB</application> with
-        Java support, you should check the system for certain versions of
-       <xref linkend="jdk"/> and <xref linkend="gmime"/>. Specifically,
-        if <application>JDK</application>-6 Update X and the
-        <command>uudecode</command> program from the
-        <application>GMime</application> program is on the system, the build
-        will fail (unless you run the modified <command>./configure</command>
-        command shown below). You can run two commands
-        (<command>javac -version</command> and
-        <command>uudecode -&#45;version</command>) to determine what versions are
-        installed. You can also download and run a shell script from
-        <ulink url="&files-anduin;/jdk-uudecode-check.sh"/> that will alert you
-        to a non-working condition. If the identified programs exist on the
-        system, you must modify the <command>./configure</command> command as
-        shown below.
-      </para>
-
-<screen><userinput>uudecode="no" ../dist/configure -&#45;(use the parameters shown below)</userinput></screen>
-    </note> -->
 
     <para>
Index: server/other/xinetd.xml
===================================================================
--- server/other/xinetd.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ server/other/xinetd.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -8,5 +8,5 @@
   <!-- <!ENTITY xinetd-download-http "http://www.xinetd.org/xinetd-&xinetd-version;.tar.gz"> -->
   <!ENTITY xinetd-download-http " ">
-  <!ENTITY xinetd-download-ftp  "&sources-anduin-ftp;/x/xinetd-&xinetd-version;.tar.gz">
+  <!ENTITY xinetd-download-ftp  "&sources-anduin-ftp;/xinetd/xinetd-&xinetd-version;.tar.gz">
   <!ENTITY xinetd-md5sum        "77358478fd58efa6366accae99b8b04c">
   <!ENTITY xinetd-size          "308 KB">
Index: x/installing/x7driver-ati.xml
===================================================================
--- x/installing/x7driver-ati.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ x/installing/x7driver-ati.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -50,5 +50,5 @@
           require Firmware to be available when the kernel driver is loaded.
           Firmware can be obtained from <ulink
-          url="http://anduin.linuxfromscratch.org/sources/linux-firmware/"/>.
+          url="&sources-anduin-http;/linux-firmware/"/>.
           See <xref linkend="xorg-ati-firmware-kernel"/> below for additional
           firmware.
Index: xsoft/other/fontforge.xml
===================================================================
--- xsoft/other/fontforge.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ xsoft/other/fontforge.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -5,5 +5,4 @@
   %general-entities;
 
-<!--  <!ENTITY fontforge-download-http "&sources-anduin-other-http;/fontforge-&fontforge-version;.tar.xz">-->
   <!ENTITY fontforge-download-http "https://github.com/fontforge/fontforge/releases/download/&fontforge-version;/fontforge-&fontforge-version;.tar.gz">
   <!ENTITY fontforge-download-ftp  " ">
Index: xsoft/other/tigervnc.xml
===================================================================
--- xsoft/other/tigervnc.xml	(revision 7a395d143a86bed5b33324e7b19e987db3000c4d)
+++ xsoft/other/tigervnc.xml	(revision a29486e423b3eb9f87ff95cdd17ec379759d0f73)
@@ -5,5 +5,5 @@
   %general-entities;
 
-  <!ENTITY tigervnc-download-http "http://anduin.linuxfromscratch.org/sources/BLFS/conglomeration/tigervnc/tigervnc-&tigervnc-version;.tar.gz">
+  <!ENTITY tigervnc-download-http "&sources-anduin-http;/tigervnc/tigervnc-&tigervnc-version;.tar.gz">
   <!ENTITY tigervnc-download-ftp  " ">
   <!ENTITY tigervnc-md5sum        "b11cc4c4d5249b9b8e355ee6f47ec4fe">
