Index: general/prog/apache-ant.xml
===================================================================
--- general/prog/apache-ant.xml	(revision 2629a889e6f81fcaf75baf676060158aafa62c6c)
+++ 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 2629a889e6f81fcaf75baf676060158aafa62c6c)
+++ 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 2629a889e6f81fcaf75baf676060158aafa62c6c)
+++ 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 2629a889e6f81fcaf75baf676060158aafa62c6c)
+++ 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 2629a889e6f81fcaf75baf676060158aafa62c6c)
+++ 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>
 
