Index: x/installing/x7app.xml
===================================================================
--- x/installing/x7app.xml	(revision 468419d8d8cb64d22518a5adeee96dc8beb26a14)
+++ x/installing/x7app.xml	(revision 6c787dede03a806d35286d4a2a80010f7b6e2b6d)
@@ -7,5 +7,5 @@
   <!ENTITY x7apps-download-http "http://xorg.freedesktop.org/releases/individual/app/">
   <!ENTITY x7apps-download-ftp  "ftp://ftp.x.org/pub/individual/app/">
-  <!ENTITY x7apps-md5sum        "&sources-anduin-http;/x/files/md5sums">
+  <!ENTITY x7apps-md5sum        "&files-anduin;/xorg/md5sums">
   <!ENTITY x7apps-size          "9.1 MB">
   <!ENTITY x7apps-buildsize     "30.7 MB">
@@ -99,5 +99,5 @@
     use the following commands:</para>
 
-<screen><userinput>wget &sources-anduin-ftp;/x/wget/app-7.1.wget &amp;&amp;
+<screen><userinput>wget &files-anduin;/xorg/app-7.1.wget &amp;&amp;
 mkdir app &amp;&amp;
 cd app &amp;&amp;
Index: x/installing/x7data.xml
===================================================================
--- x/installing/x7data.xml	(revision 468419d8d8cb64d22518a5adeee96dc8beb26a14)
+++ x/installing/x7data.xml	(revision 6c787dede03a806d35286d4a2a80010f7b6e2b6d)
@@ -7,5 +7,5 @@
   <!ENTITY x7data-download-http "http://xorg.freedesktop.org/releases/individual/data/">
   <!ENTITY x7data-download-ftp  "ftp://ftp.x.org/pub/individual/data/">
-  <!ENTITY x7data-md5sum        "&sources-anduin-http;/x/files/md5sums">
+  <!ENTITY x7data-md5sum        "&files-anduin;/xorg/md5sums">
   <!ENTITY x7data-size          "2.5 MB">
   <!ENTITY x7data-buildsize     "19.5 MB">
@@ -73,5 +73,5 @@
     use the following commands:</para>
 
-<screen><userinput>wget &sources-anduin-ftp;/x/wget/data-7.1.wget &amp;&amp;
+<screen><userinput>wget &files-anduin;/xorg/data-7.1.wget &amp;&amp;
 mkdir data &amp;&amp;
 cd data &amp;&amp;
Index: x/installing/x7driver.xml
===================================================================
--- x/installing/x7driver.xml	(revision 468419d8d8cb64d22518a5adeee96dc8beb26a14)
+++ x/installing/x7driver.xml	(revision 6c787dede03a806d35286d4a2a80010f7b6e2b6d)
@@ -7,5 +7,5 @@
   <!ENTITY x7drivers-download-http "http://xorg.freedesktop.org/releases/individual/driver/">
   <!ENTITY x7drivers-download-ftp  "ftp://ftp.x.org/pub/individual/driver/">
-  <!ENTITY x7drivers-md5sum        "&sources-anduin-http;/x/files/md5sums">
+  <!ENTITY x7drivers-md5sum        "&files-anduin;/xorg/md5sums">
   <!ENTITY x7drivers-size          "18.7 MB">
   <!ENTITY x7drivers-buildsize     "60.3 MB">
@@ -75,5 +75,5 @@
     use the following commands:</para>
 
-<screen><userinput>wget &sources-anduin-ftp;/x/wget/driver-7.1.wget &amp;&amp;
+<screen><userinput>wget &files-anduin;/xorg/driver-7.1.wget &amp;&amp;
 mkdir driver &amp;&amp;
 cd driver &amp;&amp;
Index: x/installing/x7font.xml
===================================================================
--- x/installing/x7font.xml	(revision 468419d8d8cb64d22518a5adeee96dc8beb26a14)
+++ x/installing/x7font.xml	(revision 6c787dede03a806d35286d4a2a80010f7b6e2b6d)
@@ -7,5 +7,5 @@
   <!ENTITY x7fonts-download-http "http://xorg.freedesktop.org/releases/individual/font/">
   <!ENTITY x7fonts-download-ftp  "ftp://ftp.x.org/pub/individual/font/">
-  <!ENTITY x7fonts-md5sum        "&sources-anduin-http;/x/files/md5sums">
+  <!ENTITY x7fonts-md5sum        "&files-anduin;/xorg/md5sums">
   <!ENTITY x7fonts-size          "13.3 MB">
   <!ENTITY x7fonts-buildsize     "100 MB">
@@ -70,5 +70,5 @@
     use the following commands:</para>
 
-<screen><userinput>wget &sources-anduin-ftp;/x/wget/font-7.1.wget &amp;&amp;
+<screen><userinput>wget &files-anduin;/xorg/font-7.1.wget &amp;&amp;
 mkdir font &amp;&amp;
 cd font &amp;&amp;
Index: x/installing/x7lib.xml
===================================================================
--- x/installing/x7lib.xml	(revision 468419d8d8cb64d22518a5adeee96dc8beb26a14)
+++ x/installing/x7lib.xml	(revision 6c787dede03a806d35286d4a2a80010f7b6e2b6d)
@@ -7,5 +7,5 @@
   <!ENTITY x7libs-download-http "http://xorg.freedesktop.org/releases/individual/lib/">
   <!ENTITY x7libs-download-ftp  "ftp://ftp.x.org/pub/individual/lib/">
-  <!ENTITY x7libs-md5sum        "&sources-anduin-http;/x/files/md5sums">
+  <!ENTITY x7libs-md5sum        "&files-anduin;/xorg/md5sums">
   <!ENTITY x7libs-size          "12 MB">
   <!ENTITY x7libs-buildsize     "186 MB">
@@ -96,5 +96,5 @@
     use the following commands:</para>
 
-<screen><userinput>wget &sources-anduin-ftp;/x/wget/lib-7.1.wget &amp;&amp;
+<screen><userinput>wget &files-anduin;/xorg/lib-7.1.wget &amp;&amp;
 mkdir lib &amp;&amp;
 cd lib &amp;&amp;
Index: x/installing/x7proto.xml
===================================================================
--- x/installing/x7proto.xml	(revision 468419d8d8cb64d22518a5adeee96dc8beb26a14)
+++ x/installing/x7proto.xml	(revision 6c787dede03a806d35286d4a2a80010f7b6e2b6d)
@@ -7,5 +7,5 @@
   <!ENTITY x7proto-download-http "http://xorg.freedesktop.org/releases/individual/proto/">
   <!ENTITY x7proto-download-ftp  "ftp://ftp.x.org/pub/individual/proto/">
-  <!ENTITY x7proto-md5sum        "&sources-anduin-http;/x/files/md5sums">
+  <!ENTITY x7proto-md5sum        "&files-anduin;/xorg/md5sums">
   <!ENTITY x7proto-size          "1.5 MB">
 <!-- Editors note:  Because we recommend a scripted build that removes
@@ -73,5 +73,5 @@
     use the following commands:</para>
 
-<screen><userinput>wget &sources-anduin-ftp;/x/wget/proto-7.1.wget &amp;&amp;
+<screen><userinput>wget &files-anduin;/xorg/proto-7.1.wget &amp;&amp;
 mkdir proto &amp;&amp;
 cd proto &amp;&amp;
Index: x/installing/x7util.xml
===================================================================
--- x/installing/x7util.xml	(revision 468419d8d8cb64d22518a5adeee96dc8beb26a14)
+++ x/installing/x7util.xml	(revision 6c787dede03a806d35286d4a2a80010f7b6e2b6d)
@@ -7,5 +7,5 @@
   <!ENTITY x7utils-download-http "http://xorg.freedesktop.org/releases/individual/util/">
   <!ENTITY x7utils-download-ftp  "ftp://ftp.x.org/pub/individual/util/">
-  <!ENTITY x7utils-md5sum        "&sources-anduin-http;/x/files/md5sums">
+  <!ENTITY x7utils-md5sum        "&files-anduin;/xorg/md5sums">
   <!ENTITY x7utils-size          "664 KB">
   <!ENTITY x7utils-buildsize     "5.2 MB">
@@ -75,5 +75,5 @@
     use the following commands:</para>
 
-<screen><userinput>wget &sources-anduin-ftp;/x/wget/util-7.1.wget &amp;&amp;
+<screen><userinput>wget &files-anduin;/xorg/util-7.1.wget &amp;&amp;
 mkdir util &amp;&amp;
 cd util &amp;&amp;
