Index: x/installing/x7app.xml
===================================================================
--- x/installing/x7app.xml	(revision 44874947e7c8c8a790ec0b87e2ffbe74e05bc1a9)
+++ x/installing/x7app.xml	(revision d9a6d690513ce49658045c02fdec99a05cabe0bc)
@@ -8,5 +8,5 @@
   <!ENTITY x7apps-download-ftp  "ftp://ftp.x.org/pub/individual/app/">
   <!ENTITY x7apps-wget          "&files-anduin;/xorg/app-&xorg7-version;.wget">
-  <!ENTITY x7apps-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
+  <!ENTITY x7apps-md5sum        "&files-anduin;/xorg/app-&xorg7-version;.md5">
   <!ENTITY x7apps-size          "9.0 MB">
   <!ENTITY x7apps-buildsize     "30.7 MB">
@@ -92,5 +92,6 @@
 cd app &amp;&amp;
 grep -v '^#' ../app-&xorg7-version;.wget | wget -i- \
-    -B http://xorg.freedesktop.org/releases/individual/app/</userinput></screen>
+    -B http://xorg.freedesktop.org/releases/individual/app/ &amp;&amp;
+md5sum -c ../app-&xorg7-version;.md5</userinput></screen>
 
   </sect2>
Index: x/installing/x7data.xml
===================================================================
--- x/installing/x7data.xml	(revision 44874947e7c8c8a790ec0b87e2ffbe74e05bc1a9)
+++ x/installing/x7data.xml	(revision d9a6d690513ce49658045c02fdec99a05cabe0bc)
@@ -8,5 +8,5 @@
   <!ENTITY x7data-download-ftp  "ftp://ftp.x.org/pub/individual/data/">
   <!ENTITY x7data-wget          "&files-anduin;/xorg/data-&xorg7-version;.wget">
-  <!ENTITY x7data-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
+  <!ENTITY x7data-md5sum        "&files-anduin;/xorg/data-&xorg7-version;.md5">
   <!ENTITY x7data-size          "2.1 MB">
   <!ENTITY x7data-buildsize     "19.5 MB">
@@ -84,5 +84,6 @@
 cd data &amp;&amp;
 grep -v '^#' ../data-&xorg7-version;.wget | wget -i- \
-    -B http://xorg.freedesktop.org/releases/individual/data/</userinput></screen>
+    -B http://xorg.freedesktop.org/releases/individual/data/ &amp;&amp;
+md5sum -c ../data-&xorg7-version;.md5</userinput></screen>
 
   </sect2>
Index: x/installing/x7driver.xml
===================================================================
--- x/installing/x7driver.xml	(revision 44874947e7c8c8a790ec0b87e2ffbe74e05bc1a9)
+++ x/installing/x7driver.xml	(revision d9a6d690513ce49658045c02fdec99a05cabe0bc)
@@ -8,5 +8,5 @@
   <!ENTITY x7drivers-download-ftp  "ftp://ftp.x.org/pub/individual/driver/">
   <!ENTITY x7drivers-wget          "&files-anduin;/xorg/driver-&xorg7-version;.wget">
-  <!ENTITY x7drivers-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
+  <!ENTITY x7drivers-md5sum        "&files-anduin;/xorg/driver-&xorg7-version;.md5">
   <!ENTITY x7drivers-size          "16.7 MB">
   <!ENTITY x7drivers-buildsize     "60.3 MB">
@@ -86,5 +86,6 @@
 cd driver &amp;&amp;
 grep -v '^#' ../driver-&xorg7-version;.wget | wget -i- \
-    -B http://xorg.freedesktop.org/releases/individual/driver/</userinput></screen>
+    -B http://xorg.freedesktop.org/releases/individual/driver/ &amp;&amp;
+md5sum -c ../driver-&xorg7-version;.md5</userinput></screen>
 
   </sect2>
Index: x/installing/x7font.xml
===================================================================
--- x/installing/x7font.xml	(revision 44874947e7c8c8a790ec0b87e2ffbe74e05bc1a9)
+++ x/installing/x7font.xml	(revision d9a6d690513ce49658045c02fdec99a05cabe0bc)
@@ -8,5 +8,5 @@
   <!ENTITY x7fonts-download-ftp  "ftp://ftp.x.org/pub/individual/font/">
   <!ENTITY x7fonts-wget          "&files-anduin;/xorg/font-&xorg7-version;.wget">
-  <!ENTITY x7fonts-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
+  <!ENTITY x7fonts-md5sum        "&files-anduin;/xorg/font-&xorg7-version;.md5">
   <!ENTITY x7fonts-size          "13.0 MB">
   <!ENTITY x7fonts-buildsize     "100 MB">
@@ -81,5 +81,6 @@
 cd font &amp;&amp;
 grep -v '^#' ../font-&xorg7-version;.wget | wget -i- \
-    -B http://xorg.freedesktop.org/releases/individual/font/</userinput></screen>
+    -B http://xorg.freedesktop.org/releases/individual/font/ &amp;&amp;
+md5sum -c ../font-&xorg7-version;.md5</userinput></screen>
 
   </sect2>
Index: x/installing/x7lib.xml
===================================================================
--- x/installing/x7lib.xml	(revision 44874947e7c8c8a790ec0b87e2ffbe74e05bc1a9)
+++ x/installing/x7lib.xml	(revision d9a6d690513ce49658045c02fdec99a05cabe0bc)
@@ -8,5 +8,5 @@
   <!ENTITY x7libs-download-ftp  "ftp://ftp.x.org/pub/individual/lib/">
   <!ENTITY x7libs-wget          "&files-anduin;/xorg/lib-&xorg7-version;.wget">
-  <!ENTITY x7libs-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
+  <!ENTITY x7libs-md5sum        "&files-anduin;/xorg/lib-&xorg7-version;.md5">
   <!ENTITY x7libs-size          "11.4 MB">
   <!ENTITY x7libs-buildsize     "186 MB">
@@ -99,5 +99,6 @@
 cd lib &amp;&amp;
 grep -v '^#' ../lib-&xorg7-version;.wget | wget -i- \
-    -B http://xorg.freedesktop.org/releases/individual/lib/</userinput></screen>
+    -B http://xorg.freedesktop.org/releases/individual/lib/ &amp;&amp;
+md5sum -c ../lib-&xorg7-version;.md5</userinput></screen>
 
   </sect2>
Index: x/installing/x7proto.xml
===================================================================
--- x/installing/x7proto.xml	(revision 44874947e7c8c8a790ec0b87e2ffbe74e05bc1a9)
+++ x/installing/x7proto.xml	(revision d9a6d690513ce49658045c02fdec99a05cabe0bc)
@@ -8,5 +8,5 @@
   <!ENTITY x7proto-download-ftp  "ftp://ftp.x.org/pub/individual/proto/">
   <!ENTITY x7proto-wget          "&files-anduin;/xorg/proto-&xorg7-version;.wget">
-  <!ENTITY x7proto-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
+  <!ENTITY x7proto-md5sum        "&files-anduin;/xorg/proto-&xorg7-version;.md5">
   <!ENTITY x7proto-size          "1.4 MB">
 <!-- Editors note:  Because we recommend a scripted build that removes
@@ -84,5 +84,6 @@
 cd proto &amp;&amp;
 grep -v '^#' ../proto-&xorg7-version;.wget | wget -i- \
-    -B http://xorg.freedesktop.org/releases/individual/proto/</userinput></screen>
+    -B http://xorg.freedesktop.org/releases/individual/proto/ &amp;&amp;
+md5sum -c ../proto-&xorg7-version;.md5</userinput></screen>
 
   </sect2>
Index: x/installing/x7util.xml
===================================================================
--- x/installing/x7util.xml	(revision 44874947e7c8c8a790ec0b87e2ffbe74e05bc1a9)
+++ x/installing/x7util.xml	(revision d9a6d690513ce49658045c02fdec99a05cabe0bc)
@@ -8,5 +8,5 @@
   <!ENTITY x7utils-download-ftp  "ftp://ftp.x.org/pub/individual/util/">
   <!ENTITY x7utils-wget          "&files-anduin;/xorg/util-&xorg7-version;.wget">
-  <!ENTITY x7utils-md5sum        "&files-anduin;/xorg/md5sums-&xorg7-version;">
+  <!ENTITY x7utils-md5sum        "&files-anduin;/xorg/util-&xorg7-version;.md5">
   <!ENTITY x7utils-size          "664 KB">
   <!ENTITY x7utils-buildsize     "5.2 MB">
@@ -86,5 +86,6 @@
 cd util &amp;&amp;
 grep -v '^#' ../util-&xorg7-version;.wget | wget -i- \
-    -B http://xorg.freedesktop.org/releases/individual/util/</userinput></screen>
+    -B http://xorg.freedesktop.org/releases/individual/util/ &amp;&amp;
+md5sum -c ../util-&xorg7-version;.md5</userinput></screen>
 
   </sect2>
Index: x/installing/xorg7.xml
===================================================================
--- x/installing/xorg7.xml	(revision 44874947e7c8c8a790ec0b87e2ffbe74e05bc1a9)
+++ x/installing/xorg7.xml	(revision d9a6d690513ce49658045c02fdec99a05cabe0bc)
@@ -84,5 +84,16 @@
 
 <screen>bash -e #exit on all errors
-for package in $(grep -v '^#' ../wgetlist.wget)
+section=proto
+version=&xorg7-version;
+mkdir $section
+cd $section
+
+# download and check packages
+grep -v '^#' ../${section}-${version}.wget | wget -i- \
+    -B http://xorg.freedesktop.org/releases/individual/${section}/
+md5sum -c ../${section}-${version}.md5
+
+# build packages
+for package in $(grep -v '^#' ../${section}-${version}.wget)
 do
   packagedir=$(echo $package | sed 's/.tar.bz2//')
@@ -95,5 +106,5 @@
   rm -rf $packagedir
   rm -f $package
-done 2&gt;&amp;1 | tee -a ../xorg-compile.log #log the entire loop</screen>
+done 2&gt;&amp;1 | tee -a ../xorg-${section}-compile.log #log the entire loop</screen>
 
   <para>The above shell will exit immediately on error.  If it runs to
