Index: basicnet/netprogs/ntp.xml
===================================================================
--- basicnet/netprogs/ntp.xml	(revision 4dd0208dd5e250d06f642c14f8d0878b4603c759)
+++ basicnet/netprogs/ntp.xml	(revision 9d332fc9f51a157d901853fbaa5760b1f99d4cb2)
@@ -8,5 +8,5 @@
   <!-- <!ENTITY ntp-download-ftp  "ftp://ftp.udel.edu/pub/ntp/ntp4/ntp-stable-&ntp-version;-20060224.tar.gz"> -->
   <!ENTITY ntp-download-http "http://ftp.cross-lfs.org/pub/blfs/svn/n/ntp-stable-&ntp-version;-20060224.tar.gz">
-  <!ENTITY ntp-download-ftp  "ftp://anduin.linuxfromscratch.org/BLFS/svn/n/ntp-stable-&ntp-version;-20060224.tar.gz">
+  <!ENTITY ntp-download-ftp  "&sources-anduin-ftp;/n/ntp-stable-&ntp-version;-20060224.tar.gz">
   <!ENTITY ntp-md5sum        "49d4a704b49dc1ef2a7ec0b7938c3ae1">
   <!ENTITY ntp-size          "2.3 MB">
Index: general/prog/pdl.xml
===================================================================
--- general/prog/pdl.xml	(revision 4dd0208dd5e250d06f642c14f8d0878b4603c759)
+++ general/prog/pdl.xml	(revision 9d332fc9f51a157d901853fbaa5760b1f99d4cb2)
@@ -406,52 +406,52 @@
           <listitem>
             <para><ulink
-            url="http://anduin.linuxfromscratch.org/files/BLFS/sources/NDF-&NDF-version;.tar.gz">
+            url="&files-anduin;/sources/NDF-&NDF-version;.tar.gz">
             NDF-&NDF-version;</ulink></para>
             <itemizedlist>
               <listitem>
                 <para><ulink
-                url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink-Config-&Starlink-Config-version;.tar.gz">
+                url="&files-anduin;/sources/Starlink-Config-&Starlink-Config-version;.tar.gz">
                 Starlink-Config-&Starlink-Config-version;</ulink></para>
                 <itemizedlist>
                   <listitem>
                     <para><ulink
-                    url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink_IMG.tar.gz">
+                    url="&files-anduin;/sources/Starlink_IMG.tar.gz">
                     Starlink IMG</ulink></para>
                     <itemizedlist>
                       <listitem>
                         <para><ulink
-                        url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink_NDF.tar.gz">
+                        url="&files-anduin;/sources/Starlink_NDF.tar.gz">
                         Starlink NDF</ulink> (requires the following Starlink
                         modules installed in this order, some will already be
                         installed if you installed Starlink GSD):
-                        <ulink url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink_HTX.tar.gz">
+                        <ulink url="&files-anduin;/sources/Starlink_HTX.tar.gz">
                         HTX</ulink>,
-                        <ulink url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink_SAE.tar.gz">
+                        <ulink url="&files-anduin;/sources/Starlink_SAE.tar.gz">
                         SAE</ulink>,
-                        <ulink url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink_HLP.tar.gz">
+                        <ulink url="&files-anduin;/sources/Starlink_HLP.tar.gz">
                         HLP</ulink>,
-                        <ulink url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink_CNF.tar.gz">
+                        <ulink url="&files-anduin;/sources/Starlink_CNF.tar.gz">
                         CNF</ulink>,
-                        <ulink url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink_SLA.tar.gz">
+                        <ulink url="&files-anduin;/sources/Starlink_SLA.tar.gz">
                         SLA</ulink>,
-                        <ulink url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink_CHR.tar.gz">
+                        <ulink url="&files-anduin;/sources/Starlink_CHR.tar.gz">
                         CHR</ulink>,
-                        <ulink url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink_EMS.tar.gz">
+                        <ulink url="&files-anduin;/sources/Starlink_EMS.tar.gz">
                         EMS</ulink>,
-                        <ulink url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink_PSX.tar.gz">
+                        <ulink url="&files-anduin;/sources/Starlink_PSX.tar.gz">
                         PSX</ulink>,
-                        <ulink url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink_HDS.tar.gz">
+                        <ulink url="&files-anduin;/sources/Starlink_HDS.tar.gz">
                         HDS</ulink>,
-                        <ulink url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink_PCS.tar.gz">
+                        <ulink url="&files-anduin;/sources/Starlink_PCS.tar.gz">
                         PCS</ulink>,
-                        <ulink url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink_MER.tar.gz">
+                        <ulink url="&files-anduin;/sources/Starlink_MER.tar.gz">
                         MER</ulink>,
-                        <ulink url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink_PRM.tar.gz">
+                        <ulink url="&files-anduin;/sources/Starlink_PRM.tar.gz">
                         PRM</ulink>,
-                        <ulink url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink_PAR.tar.gz">
+                        <ulink url="&files-anduin;/sources/Starlink_PAR.tar.gz">
                         PAR</ulink>,
-                        <ulink url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink_ARY.tar.gz">
+                        <ulink url="&files-anduin;/sources/Starlink_ARY.tar.gz">
                         ARY</ulink>,
-                        <ulink url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink_AST.tar.gz">
+                        <ulink url="&files-anduin;/sources/Starlink_AST.tar.gz">
                         AST</ulink>)</para>
                         <itemizedlist>
@@ -471,28 +471,28 @@
           <listitem>
             <para><ulink
-            url="http://anduin.linuxfromscratch.org/files/BLFS/sources/GSD-&GSD-version;.tar.gz">
+            url="&files-anduin;/sources/GSD-&GSD-version;.tar.gz">
             GSD-&GSD-version;</ulink></para>
             <itemizedlist>
               <listitem>
                 <para><ulink
-                url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink-Config-&Starlink-Config-version;.tar.gz">
+                url="&files-anduin;/sources/Starlink-Config-&Starlink-Config-version;.tar.gz">
                 Starlink-Config-&Starlink-Config-version;</ulink></para>
                 <itemizedlist>
                   <listitem>
                     <para><ulink
-                    url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink_GSD.tar.gz">
+                    url="&files-anduin;/sources/Starlink_GSD.tar.gz">
                     Starlink GSD</ulink> (requires the following Starlink
                     modules installed in this order:
-                    <ulink url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink_HTX.tar.gz">
+                    <ulink url="&files-anduin;/sources/Starlink_HTX.tar.gz">
                     HTX</ulink>,
-                    <ulink url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink_SAE.tar.gz">
+                    <ulink url="&files-anduin;/sources/Starlink_SAE.tar.gz">
                     SAE</ulink>,
-                    <ulink url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink_CNF.tar.gz">
+                    <ulink url="&files-anduin;/sources/Starlink_CNF.tar.gz">
                     CNF</ulink>,
-                    <ulink url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink_CHR.tar.gz">
+                    <ulink url="&files-anduin;/sources/Starlink_CHR.tar.gz">
                     CHR</ulink>,
-                    <ulink url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink_EMS.tar.gz">
+                    <ulink url="&files-anduin;/sources/Starlink_EMS.tar.gz">
                     EMS</ulink>,
-                    <ulink url="http://anduin.linuxfromscratch.org/files/BLFS/sources/Starlink_PRM.tar.gz">
+                    <ulink url="&files-anduin;/sources/Starlink_PRM.tar.gz">
                     PRM</ulink>)</para>
                     <itemizedlist>
Index: server/databases/postgresql.xml
===================================================================
--- server/databases/postgresql.xml	(revision 4dd0208dd5e250d06f642c14f8d0878b4603c759)
+++ server/databases/postgresql.xml	(revision 9d332fc9f51a157d901853fbaa5760b1f99d4cb2)
@@ -7,5 +7,5 @@
   <!-- <!ENTITY postgresql-download-http "http://gd.tuwien.ac.at/db/postgresql/source/v&postgresql-version;/postgresql-&postgresql-version;.tar.bz2"> -->
   <!-- <!ENTITY postgresql-download-ftp  "ftp://ftp.fr.postgresql.org/source/v&postgresql-version;/postgresql-&postgresql-version;.tar.bz2"> -->
-  <!ENTITY postgresql-download-http "http://anduin.linuxfromscratch.org/sources/BLFS/svn/p/postgresql-&postgresql-version;.tar.bz2">
+  <!ENTITY postgresql-download-http "&sources-anduin-http;/p/postgresql-&postgresql-version;.tar.bz2">
   <!ENTITY postgresql-download-ftp  "ftp://ftp-archives.postgresql.org/pub/source/v&postgresql-version;/postgresql-&postgresql-version;.tar.bz2">
   <!ENTITY postgresql-md5sum        "bb510edbb533962c0692e211b3bd8cfa">
