Index: BOOK/general.ent
===================================================================
--- BOOK/general.ent	(revision 32a86c11a23a9997cb9004ea3d7ab206fbe63f74)
+++ BOOK/general.ent	(revision 5d7de1ccdcc8eecfc1c7b22b49bb3ec55148e1fb)
@@ -36,86 +36,7 @@
 <!ENTITY dependencies "Installation depends on">
 
+<!ENTITY % packages-entities SYSTEM "packages.ent">
+%packages-entities;
+
 <!ENTITY % patches-entities SYSTEM "patches.ent">
 %patches-entities;
-
-<!ENTITY aboot-version "0.9b">
-<!ENTITY autoconf-version "2.59">
-<!ENTITY automake-version "1.9.6">
-<!ENTITY bash-version "3.0">
-<!ENTITY bash-doc-version "3.0">
-<!ENTITY binutils-version "2.16.1">
-<!ENTITY bison-version "2.1">
-<!ENTITY bzip2-version "1.0.3">
-<!ENTITY colo-version "1.19">
-<!ENTITY coreutils-version "5.93">
-<!ENTITY dejagnu-version "1.4.4">
-<!ENTITY diffutils-version "2.8.7">
-<!ENTITY e2fsprogs-version "1.38">
-<!ENTITY elftoaout-version "2.3">
-<!ENTITY expect-version "5.43.0">
-<!ENTITY expect-lib-version "5.43">
-<!ENTITY file-version "4.16">
-<!ENTITY findutils-version "4.2.25">
-<!ENTITY flex-version "2.5.31">
-<!ENTITY gawk-version "3.1.5">
-<!ENTITY gcc-version "4.0.2">
-<!ENTITY gettext-version "0.14.5">
-<!ENTITY glibc-version "20051024">
-<!ENTITY grep-version "2.5.1a">
-<!ENTITY groff-version "1.19.2">
-<!ENTITY grub-version "0.97">
-<!ENTITY gzip-version "1.3.5">
-<!ENTITY hfsutils-version "3.2.6">
-<!ENTITY hotplug-version "2004_09_23">
-<!ENTITY iana-etc-version "2.00">
-<!ENTITY iproute2-version "050816">
-<!ENTITY inetutils-version "1.4.2">
-<!ENTITY kbd-version "1.12">
-<!ENTITY less-version "385">
-<!ENTITY lfs-bootscripts-version "3.2.2">
-<!ENTITY libtool-version "1.5.20">
-<!ENTITY linux-dl-version "2.6">
-<!ENTITY linux-x86-version "2.6.12.6">
-<!ENTITY linux-x86_64-version "2.6.12.6">
-<!ENTITY linux-ppc-version "2.6.12.6">
-<!ENTITY linux-mips-version "2.6.12.6">
-<!ENTITY linux-mips64-version "2.6.12.6">
-<!ENTITY linux-sparc-version "2.6.12.6">
-<!ENTITY linux-sparc64-version "2.6.12.6">
-<!ENTITY linux-alpha-version "2.6.12.6">
-<!ENTITY linux-libc-headers-x86-version "2.6.12.0">
-<!ENTITY linux-libc-headers-x86_64-version "2.6.12.0">
-<!ENTITY linux-libc-headers-ppc-version "2.6.12.0">
-<!ENTITY linux-libc-headers-mips-version "2.6.12.0">
-<!ENTITY linux-libc-headers-mips64-version "2.6.12.0">
-<!ENTITY linux-libc-headers-sparc-version "2.6.12.0">
-<!ENTITY linux-libc-headers-sparc64-version "2.6.12.0">
-<!ENTITY linux-libc-headers-alpha-version "2.6.12.0">
-<!ENTITY m4-version "1.4.3">
-<!ENTITY make-version "3.80">
-<!ENTITY man-version "1.6b">
-<!ENTITY man-pages-version "2.13">
-<!ENTITY mktemp-version "1.5">
-<!ENTITY module-init-tools-version "3.1">
-<!ENTITY ncurses-version "5.5">
-<!ENTITY patch-version "2.5.9">
-<!ENTITY parted-version "1.6.24">
-<!ENTITY perl-version "5.8.7">
-<!ENTITY powerpcutils-version "1.1.3">
-<!ENTITY procps-version "3.2.6">
-<!ENTITY psmisc-version "21.8">
-<!ENTITY readline-version "5.0">
-<!ENTITY sed-version "4.1.4">
-<!ENTITY shadow-version "4.0.13">
-<!ENTITY silo-version "1.4.9">
-<!ENTITY sysklogd-version "1.4.1">
-<!ENTITY sysvinit-version "2.86">
-<!ENTITY tar-version "1.15.1">
-<!ENTITY tcl-version "8.4.11">
-<!ENTITY texinfo-version "4.8">
-<!ENTITY util-linux-version "2.12r">
-<!ENTITY udev-version "071">
-<!ENTITY udev-config-file "udev-config-cross-lfs-1.rules">
-<!ENTITY yaboot-version "1.3.13">
-<!ENTITY vim-version "6.4">
-<!ENTITY zlib-version "1.2.3">
Index: BOOK/materials/alpha/packages.xml
===================================================================
--- BOOK/materials/alpha/packages.xml	(revision 32a86c11a23a9997cb9004ea3d7ab206fbe63f74)
+++ BOOK/materials/alpha/packages.xml	(revision 5d7de1ccdcc8eecfc1c7b22b49bb3ec55148e1fb)
@@ -14,16 +14,21 @@
 
     <varlistentry>
-      <term>Aboot (&aboot-version;) - 2.6 MB:</term>
+      <term>Aboot (&aboot-version;) - &aboot-size;:</term>
       <listitem>
-        <para><ulink
-        url="&sourceforge;aboot/aboot-&aboot-version;.tar.bz2?download"/></para>
+        <para><ulink url="&aboot-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Linux-Libc-Headers (&linux-libc-headers-alpha-version;) - 2.6 MB:</term>
+      <term>Linux (&linux-alpha-version;) - &linux-alpha-size;:</term>
       <listitem>
-        <para><ulink
-        url="http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-&linux-libc-headers-alpha-version;.tar.bz2"/></para>
+        <para><ulink url="&linux-alpha-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Linux-Libc-Headers (&linux-libc-headers-alpha-version;) - &linux-libc-headers-alpha-size;:</term>
+      <listitem>
+        <para><ulink url="&linux-libc-headers-alpha-url;"/></para>
       </listitem>
     </varlistentry>
Index: BOOK/materials/common/packages.xml
===================================================================
--- BOOK/materials/common/packages.xml	(revision 32a86c11a23a9997cb9004ea3d7ab206fbe63f74)
+++ BOOK/materials/common/packages.xml	(revision 5d7de1ccdcc8eecfc1c7b22b49bb3ec55148e1fb)
@@ -16,104 +16,91 @@
 
     <varlistentry>
-      <term>Autoconf (&autoconf-version;) - 908 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&gnu;autoconf/autoconf-&autoconf-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Automake (&automake-version;) - 748 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&gnu;automake/automake-&automake-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Bash (&bash-version;) - 1.8 MB:</term>
-      <listitem>
-        <para><ulink
-        url="&gnu;bash/bash-&bash-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Bash Documentation (&bash-doc-version;) - 1.9 MB:</term>
-      <listitem>
-        <para><ulink
-        url="&gnu;bash/bash-doc-&bash-doc-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Binutils (&binutils-version;) - 12.2 MB:</term>
-      <listitem>
-        <para><ulink
-        url="&gnu;binutils/binutils-&binutils-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Bison (&bison-version;) - 916 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&gnu;bison/bison-&bison-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Bzip2 (&bzip2-version;) - 596 KB:</term>
-      <listitem>
-        <para><ulink
-        url="http://www.bzip.org/&bzip2-version;/bzip2-&bzip2-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Coreutils (&coreutils-version;) - 4.1 MB:</term>
-      <listitem>
-        <para><ulink
-        url="&gnu;coreutils/coreutils-&coreutils-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>DejaGNU (&dejagnu-version;) - 852 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&gnu;dejagnu/dejagnu-&dejagnu-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Diffutils (&diffutils-version;) - 648 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&alpha-gnu;diffutils/diffutils-&diffutils-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>E2fsprogs (&e2fsprogs-version;) - 3.1 MB:</term>
-      <listitem>
-        <para><ulink
-        url="&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz?download"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Expect (&expect-version;) - 416 KB:</term>
-      <listitem>
-        <para><ulink
-        url="http://expect.nist.gov/src/expect-&expect-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>File (&file-version;) - 400 KB:</term>
-      <listitem>
-        <para><ulink
-        url="ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz"/></para>
+      <term>Autoconf (&autoconf-version;) - &autoconf-size;:</term>
+      <listitem>
+        <para><ulink url="&autoconf-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Automake (&automake-version;) - &automake-size;:</term>
+      <listitem>
+        <para><ulink url="&automake-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Bash (&bash-version;) - &bash-size;:</term>
+      <listitem>
+        <para><ulink url="&bash-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Bash Documentation (&bash-doc-version;) - &bash-doc-size;:</term>
+      <listitem>
+        <para><ulink url="&bash-doc-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Binutils (&binutils-version;) - &binutils-size;:</term>
+      <listitem>
+        <para><ulink url="&binutils-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Bison (&bison-version;) - &bison-size;:</term>
+      <listitem>
+        <para><ulink url="&bison-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Bzip2 (&bzip2-version;) - &bzip2-size;:</term>
+      <listitem>
+        <para><ulink url="&bzip2-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Coreutils (&coreutils-version;) - &coreutils-size;:</term>
+      <listitem>
+        <para><ulink url="&coreutils-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>DejaGNU (&dejagnu-version;) - &dejagnu-size;:</term>
+      <listitem>
+        <para><ulink url="&dejagnu-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Diffutils (&diffutils-version;) - &diffutils-size;:</term>
+      <listitem>
+        <para><ulink url="&diffutils-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>E2fsprogs (&e2fsprogs-version;) - &e2fsprogs-size;:</term>
+      <listitem>
+        <para><ulink url="&e2fsprogs-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Expect (&expect-version;) - &expect-size;:</term>
+      <listitem>
+        <para><ulink url="&expect-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>File (&file-version;) - &file-size;:</term>
+      <listitem>
+        <para><ulink url="&file-url;"/></para>
 
         <note>
@@ -129,281 +116,247 @@
 
     <varlistentry>
-      <term>Findutils (&findutils-version;) - 784 KB:</term>
+      <term>Findutils (&findutils-version;) - &findutils-size;:</term>
+      <listitem>
+        <para><ulink url="&findutils-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Flex (&flex-version;) - &flex-size;:</term>
+      <listitem>
+        <para><ulink url="&flex-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Gawk (&gawk-version;) - &gawk-size;:</term>
+      <listitem>
+        <para><ulink url="&gawk-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>GCC (&gcc-version;) - &gcc-size;:</term>
+      <listitem>
+        <para><ulink url="&gcc-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Gettext (&gettext-version;) - &gettext-size;:</term>
+      <listitem>
+        <para><ulink url="&gettext-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Glibc (&glibc-version;) - &glibc-size;:</term>
+      <listitem>
+        <para><ulink url="&glibc-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+<!-- Glibc Release
+    <varlistentry>
+      <term>Glibc (&glibc-version;) - &glibc-size;:</term>
+      <listitem>
+        <para><ulink url="&glibc-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Glibc Libidn (&glibc-version;) - &glibc-libidn-size;:</term>
+      <listitem>
+        <para><ulink url="&glibc-libidn-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Glibc Linuxthreads (&glibc-version;) - &glibc-linuxthreads-size;:</term>
+      <listitem>
+        <para><ulink url="&glibc-linuxthreads-url;"/></para>
+      </listitem>
+    </varlistentry>
+-->
+    <varlistentry>
+      <term>Grep (&grep-version;) - &grep-size;:</term>
+      <listitem>
+        <para><ulink url="&grep-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Groff (&groff-version;) - &groff-size;:</term>
+      <listitem>
+        <para><ulink url="&groff-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Gzip (&gzip-version;) - &gzip-size;:</term>
+      <listitem>
+        <para><ulink url="&gzip-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Hotplug (&hotplug-version;) - &hotplug-size;:</term>
+      <listitem>
+        <para><ulink url="&hotplug-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Iana-Etc (&iana-etc-version;) - &iana-etc-size;:</term>
+      <listitem>
+        <para><ulink url="&iana-etc-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Inetutils (&inetutils-version;) - &inetutils-size;:</term>
+      <listitem>
+        <para><ulink url="&inetutils-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>IPRoute2 (&iproute2-version;) - &iproute2-size;:</term>
+      <listitem>
+        <para><ulink url="&iproute2-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Kbd (&kbd-version;) - &kbd-size;:</term>
+      <listitem>
+        <para><ulink url="&kbd-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Less (&less-version;) - &less-size;:</term>
+      <listitem>
+        <para><ulink url="&less-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>LFS-Bootscripts (&lfs-bootscripts-version;) - &lfs-bootscripts-size;:</term>
+      <listitem>
+        <para><ulink url="&lfs-bootscripts-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Libtool (&libtool-version;) - &libtool-size;:</term>
+      <listitem>
+        <para><ulink url="&libtool-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>M4 (&m4-version;) - &m4-size;:</term>
+      <listitem>
+        <para><ulink url="&m4-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Make (&make-version;) - &make-size;:</term>
+      <listitem>
+        <para><ulink url="&make-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Man (&man-version;) - &man-size;:</term>
+      <listitem>
+        <para><ulink url="&man-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Man-pages (&man-pages-version;) - &man-pages-size;:</term>
+      <listitem>
+        <para><ulink url="&man-pages-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Mktemp (&mktemp-version;) - &mktemp-size;:</term>
+      <listitem>
+        <para><ulink url="&mktemp-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Module-Init-Tools (&module-init-tools-version;) - &module-init-tools-size;:</term>
+      <listitem>
+        <para><ulink url="&module-init-tools-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Module-Init-Tools-Testsuite (&module-init-tools-version;) - &module-init-tools-testsuite-size;:</term>
+      <listitem>
+        <para><ulink url="&module-init-tools-testsuite-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Ncurses (&ncurses-version;) - &ncurses-size;:</term>
+      <listitem>
+        <para><ulink url="&ncurses-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Patch (&patch-version;) - &patch-size;:</term>
+      <listitem>
+        <para><ulink url="&patch-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Perl (&perl-version;) - &perl-size;:</term>
+      <listitem>
+        <para><ulink url="&perl-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Procps (&procps-version;) - &procps-size;:</term>
+      <listitem>
+        <para><ulink url="&procps-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Psmisc (&psmisc-version;) - &psmisc-size;:</term>
+      <listitem>
+        <para><ulink url="&psmisc-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Readline (&readline-version;) - &readline-size;:</term>
       <listitem>
         <para><ulink
-        url="&gnu;findutils/findutils-&findutils-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Flex (&flex-version;) - 672 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&sourceforge;lex/flex-&flex-version;.tar.bz2?download"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Gawk (&gawk-version;) - 1.6 MB:</term>
-      <listitem>
-        <para><ulink
-        url="&gnu;gawk/gawk-&gawk-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>GCC (&gcc-version;) - 30.3 MB:</term>
-      <listitem>
-        <para><ulink
-        url="&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Gettext (&gettext-version;) - 4.6 MB:</term>
-      <listitem>
-        <para><ulink
-        url="&gnu;gettext/gettext-&gettext-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Glibc (&glibc-version;) - 14 MB:</term>
-      <listitem>
-        <para><ulink
-        url="ftp://sources.redhat.com/pub/glibc/snapshots/glibc-&glibc-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-<!-- Glibc Release
-    <varlistentry>
-      <term>Glibc (&glibc-version;) - 13.2 MB:</term>
-      <listitem>
-        <para><ulink
-        url="&gnu;glibc/glibc-&glibc-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Glibc Libidn (&glibc-version;) - 99 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&gnu;glibc/glibc-libidn-&glibc-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Glibc Linuxthreads (&glibc-version;) - 236 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&gnu;glibc/glibc-linuxthreads-&glibc-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
--->
-    <varlistentry>
-      <term>Grep (&grep-version;) - 520 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&gnu;grep/grep-&grep-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Groff (&groff-version;) - 2.0 MB:</term>
-      <listitem>
-        <para><ulink
-        url="&gnu;groff/groff-&groff-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Gzip (&gzip-version;) - 284 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&alpha-gnu;gzip/gzip-&gzip-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Hotplug (&hotplug-version;) - 40 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&kernel;linux/utils/kernel/hotplug/hotplug-&hotplug-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Iana-Etc (&iana-etc-version;) - 168 KB:</term>
-      <listitem>
-        <para><ulink
-        url="http://www.sethwklein.net/projects/iana-etc/downloads/iana-etc-&iana-etc-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Inetutils (&inetutils-version;) - 752 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&gnu;inetutils/inetutils-&inetutils-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>IPRoute2 (&iproute2-version;) - 276 KB:</term>
-      <listitem>
-        <para><ulink
-        url="http://developer.osdl.org/dev/iproute2/download/iproute2-&iproute2-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Kbd (&kbd-version;) - 624 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&kernel;linux/utils/kbd/kbd-&kbd-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Less (&less-version;) - 216 KB:</term>
-      <listitem>
-        <para><ulink
-        url="http://www.greenwoodsoftware.com/less/less-&less-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>LFS-Bootscripts (&lfs-bootscripts-version;) - 32 KB:</term>
-      <listitem>
-        <para><ulink
-        url="http://downloads.linuxfromscratch.org/lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Libtool (&libtool-version;) - 1.6 MB:</term>
-      <listitem>
-        <para><ulink
-        url="&gnu;libtool/libtool-&libtool-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>M4 (&m4-version;) - 304 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&gnu;m4/m4-&m4-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Make (&make-version;) - 904 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&gnu;make/make-&make-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Man (&man-version;) - 208 KB:</term>
-      <listitem>
-        <para><ulink
-        url="http://primates.ximian.com/~flucifredi/man/man-&man-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Man-pages (&man-pages-version;) - 1.6 MB:</term>
-      <listitem>
-        <para><ulink
-        url="&kernel;linux/docs/manpages/man-pages-&man-pages-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Mktemp (&mktemp-version;) - 68 KB:</term>
-      <listitem>
-        <para><ulink
-        url="ftp://ftp.cs.colorado.edu/pub/mktemp/mktemp-&mktemp-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Module-Init-Tools (&module-init-tools-version;) - 128 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&kernel;linux/utils/kernel/module-init-tools/module-init-tools-&module-init-tools-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Module-Init-Tools-Testsuite (&module-init-tools-version;) - 34 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&kernel;linux/utils/kernel/module-init-tools/module-init-tools-testsuite-&module-init-tools-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Ncurses (&ncurses-version;) - 2.3 MB:</term>
-      <listitem>
-        <para><ulink
-        url="ftp://invisible-island.net/ncurses/ncurses-&ncurses-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Patch (&patch-version;) - 156 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&alpha-gnu;diffutils/patch-&patch-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Perl (&perl-version;) - 9.6 MB:</term>
-      <listitem>
-        <para><ulink
-        url="http://ftp.funet.fi/pub/CPAN/src/perl-&perl-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Procps (&procps-version;) - 224 KB:</term>
-      <listitem>
-        <para><ulink
-        url="http://procps.sourceforge.net/procps-&procps-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Psmisc (&psmisc-version;) - 188 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&sourceforge;psmisc/psmisc-&psmisc-version;.tar.gz?download"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Readline (&readline-version;) - 1.4 MB:</term>
-      <listitem>
-        <para><ulink
-        url="&gnu;readline/readline-&readline-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Sed (&sed-version;) - 632 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&gnu;sed/sed-&sed-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Shadow (&shadow-version;) - 1,080 KB:</term>
-      <listitem>
-        <para><ulink
-        url="ftp://ftp.pld.org.pl/software/shadow/shadow-&shadow-version;.tar.bz2"/></para>
+        url="&readline-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Sed (&sed-version;) - &sed-size;:</term>
+      <listitem>
+        <para><ulink url="&sed-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Shadow (&shadow-version;) - &shadow-size;:</term>
+      <listitem>
+        <para><ulink url="&shadow-url;"/></para>
 
         <note>
@@ -419,88 +372,77 @@
 
     <varlistentry>
-      <term>Sysklogd (&sysklogd-version;) - 72 KB:</term>
-      <listitem>
-        <para><ulink
-        url="http://www.infodrom.org/projects/sysklogd/download/sysklogd-&sysklogd-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Sysvinit (&sysvinit-version;) - 88 KB:</term>
-      <listitem>
-        <para><ulink
-        url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-&sysvinit-version;.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Tar (&tar-version;) - 1.6 MB:</term>
-      <listitem>
-        <para><ulink
-        url="&gnu;tar/tar-&tar-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Tcl (&tcl-version;) - 2.6 MB:</term>
-      <listitem>
-        <para><ulink
-        url="&sourceforge;tcl/tcl&tcl-version;-src.tar.gz?download"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Texinfo (&texinfo-version;) - 1.5 MB:</term>
-      <listitem>
-        <para><ulink
-        url="&gnu;texinfo/texinfo-&texinfo-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Udev (&udev-version;) - 424 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&kernel;linux/utils/kernel/hotplug/udev-&udev-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Udev Rules Configuration - 1 KB:</term>
-      <listitem>
-        <para><ulink
-        url="http://downloads.linuxfromscratch.org/&udev-config-file;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Util-linux (&util-linux-version;) - 1.3 MB:</term>
-      <listitem>
-        <para><ulink
-        url="&kernel;linux/utils/util-linux/util-linux-&util-linux-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Vim (&vim-version;) - 3.6 MB:</term>
-      <listitem>
-        <para><ulink
-        url="ftp://ftp.vim.org/pub/vim/unix/vim-&vim-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Vim (&vim-version;) language files (optional) - 540 KB:</term>
-      <listitem>
-        <para><ulink
-        url="ftp://ftp.vim.org/pub/vim/extra/vim-&vim-version;-lang.tar.gz"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Zlib (&zlib-version;) - 368 KB:</term>
-      <listitem>
-        <para><ulink
-        url="http://www.zlib.net/zlib-&zlib-version;.tar.gz"/></para>
+      <term>Sysklogd (&sysklogd-version;) - &sysklogd-size;:</term>
+      <listitem>
+        <para><ulink url="&sysklogd-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Sysvinit (&sysvinit-version;) - &sysvinit-size;:</term>
+      <listitem>
+        <para><ulink url="&sysvinit-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Tar (&tar-version;) - &tar-size;:</term>
+      <listitem>
+        <para><ulink url="&tar-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Tcl (&tcl-version;) - &tcl-size;:</term>
+      <listitem>
+        <para><ulink url="&tcl-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Texinfo (&texinfo-version;) - &texinfo-size;:</term>
+      <listitem>
+        <para><ulink url="&texinfo-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Udev (&udev-version;) - &udev-size;:</term>
+      <listitem>
+        <para><ulink url="&udev-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Udev Rules Configuration - &udev-config-size;:</term>
+      <listitem>
+        <para><ulink url="&udev-config-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Util-linux (&util-linux-version;) - &util-linux-size;:</term>
+      <listitem>
+        <para><ulink url="&util-linux-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Vim (&vim-version;) - &vim-size;:</term>
+      <listitem>
+        <para><ulink url="&vim-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Vim (&vim-version;) language files (optional) - &vim-language-size;:</term>
+      <listitem>
+        <para><ulink url="&vim-language-url;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Zlib (&zlib-version;) - &zlib-size;:</term>
+      <listitem>
+        <para><ulink url="&zlib-url;"/></para>
       </listitem>
     </varlistentry>
Index: BOOK/materials/mips/packages.xml
===================================================================
--- BOOK/materials/mips/packages.xml	(revision 32a86c11a23a9997cb9004ea3d7ab206fbe63f74)
+++ BOOK/materials/mips/packages.xml	(revision 5d7de1ccdcc8eecfc1c7b22b49bb3ec55148e1fb)
@@ -14,24 +14,21 @@
 
     <varlistentry>
-      <term>Colo (&colo-version;) - 240 KB:</term>
+      <term>Colo (&colo-version;) - &colo-size;:</term>
       <listitem>
-        <para><ulink
-        url="http://www.colonel-panic.org/cobalt-mips/colo/colo-&colo-version;.tar.gz"/></para>
+        <para><ulink url="&colo-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Linux (&linux-mips-version;) - 35 MB:</term>
+      <term>Linux (&linux-mips-version;) - &linux-mips-size;:</term>
       <listitem>
-        <para><ulink
-        url="&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-mips-version;.tar.bz2"/></para>
+        <para><ulink url="&linux-mips-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Linux-Libc-Headers (&linux-libc-headers-mips-version;) - 2.6 MB:</term>
+      <term>Linux-Libc-Headers (&linux-libc-headers-mips-version;) - &linux-libc-headers-mips-size;:</term>
       <listitem>
-        <para><ulink
-        url="http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-&linux-libc-headers-mips-version;.tar.bz2"/></para>
+        <para><ulink url="&linux-libc-headers-mips-url;"/></para>
       </listitem>
     </varlistentry>
Index: BOOK/materials/mips64-64/packages.xml
===================================================================
--- BOOK/materials/mips64-64/packages.xml	(revision 32a86c11a23a9997cb9004ea3d7ab206fbe63f74)
+++ BOOK/materials/mips64-64/packages.xml	(revision 5d7de1ccdcc8eecfc1c7b22b49bb3ec55148e1fb)
@@ -14,24 +14,21 @@
 
     <varlistentry>
-      <term>Colo (&colo-version;) - 240 KB:</term>
+      <term>Colo (&colo-version;) - &colo-size;:</term>
       <listitem>
-        <para><ulink
-        url="http://www.colonel-panic.org/cobalt-mips/colo/colo-&colo-version;.tar.gz"/></para>
+        <para><ulink url="&colo-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Linux (&linux-mips64-version;) - 35 MB:</term>
+      <term>Linux (&linux-mips64-version;) - &linux-mips64-size;:</term>
       <listitem>
-        <para><ulink
-        url="&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-mips64-version;.tar.bz2"/></para>
+        <para><ulink url="&linux-mips64-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Linux-Libc-Headers (&linux-libc-headers-mips64-version;) - 2.6 MB:</term>
+      <term>Linux-Libc-Headers (&linux-libc-headers-mips64-version;) - &linux-libc-headers-mips64-size;:</term>
       <listitem>
-        <para><ulink
-        url="http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-&linux-libc-headers-mips64-version;.tar.bz2"/></para>
+        <para><ulink url="&linux-libc-headers-mips64-url;"/></para>
       </listitem>
     </varlistentry>
Index: BOOK/materials/mips64/packages.xml
===================================================================
--- BOOK/materials/mips64/packages.xml	(revision 32a86c11a23a9997cb9004ea3d7ab206fbe63f74)
+++ BOOK/materials/mips64/packages.xml	(revision 5d7de1ccdcc8eecfc1c7b22b49bb3ec55148e1fb)
@@ -14,24 +14,21 @@
 
     <varlistentry>
-      <term>Colo (&colo-version;) - 240 KB:</term>
+      <term>Colo (&colo-version;) - &colo-size;:</term>
       <listitem>
-        <para><ulink
-        url="http://www.colonel-panic.org/cobalt-mips/colo/colo-&colo-version;.tar.gz"/></para>
+        <para><ulink url="&colo-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Linux (&linux-mips64-version;) - 35 MB:</term>
+      <term>Linux (&linux-mips64-version;) - &linux-mips64-size;:</term>
       <listitem>
-        <para><ulink
-        url="&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-mips64-version;.tar.bz2"/></para>
+        <para><ulink url="&linux-mips64-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Linux-Libc-Headers (&linux-libc-headers-mips64-version;) - 2.6 MB:</term>
+      <term>Linux-Libc-Headers (&linux-libc-headers-mips64-version;) - &linux-libc-headers-mips64-size;:</term>
       <listitem>
-        <para><ulink
-        url="http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-&linux-libc-headers-mips64-version;.tar.bz2"/></para>
+        <para><ulink url="&linux-libc-headers-mips64-url;"/></para>
       </listitem>
     </varlistentry>
Index: BOOK/materials/ppc/packages.xml
===================================================================
--- BOOK/materials/ppc/packages.xml	(revision 32a86c11a23a9997cb9004ea3d7ab206fbe63f74)
+++ BOOK/materials/ppc/packages.xml	(revision 5d7de1ccdcc8eecfc1c7b22b49bb3ec55148e1fb)
@@ -14,48 +14,42 @@
 
     <varlistentry>
-      <term>Hfsutils (&hfsutils-version;) - 203 KB:</term>
+      <term>Hfsutils (&hfsutils-version;) - &hfsutils-size;:</term>
       <listitem>
-        <para><ulink
-        url="ftp://ftp.mars.org/pub/hfs/hfsutils-&hfsutils-version;.tar.gz"/></para>
+        <para><ulink url="&hfsutils-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Linux (&linux-ppc-version;) - 35 MB:</term>
+      <term>Linux (&linux-ppc-version;) - &linux-ppc-size;:</term>
       <listitem>
-        <para><ulink
-        url="&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-ppc-version;.tar.bz2"/></para>
+        <para><ulink url="&linux-ppc-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Linux-Libc-Headers (&linux-libc-headers-ppc-version;) - 2.5 MB:</term>
+      <term>Linux-Libc-Headers (&linux-libc-headers-ppc-version;) - &linux-libc-headers-ppc-size;:</term>
       <listitem>
-        <para><ulink
-        url="http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-&linux-libc-headers-ppc-version;.tar.bz2"/></para>
+        <para><ulink url="&linux-libc-headers-ppc-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Parted (&parted-version;) - 1.4 MB:</term>
+      <term>Parted (&parted-version;) - &parted-size;:</term>
       <listitem>
-        <para><ulink
-        url="&gnu;/parted/parted-&parted-version;.tar.gz"/></para>
+        <para><ulink url="&parted-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Powerpc-utils (&powerpcutils-version;) - 25 KB:</term>
+      <term>Powerpc-utils (&powerpcutils-version;) - &powerpcutils-size;:</term>
       <listitem>
-        <para><ulink
-        url="http://ftp.debian.org/debian/pool/main/p/powerpc-utils/powerpc-utils_&powerpcutils-version;.orig.tar.gz"/></para>
+        <para><ulink url="&powerpcutils-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Yaboot (&yaboot-version;) - 270 KB:</term>
+      <term>Yaboot (&yaboot-version;) - &yaboot-size;:</term>
       <listitem>
-        <para><ulink
-        url="http://penguinppc.org/bootloaders/yaboot/yaboot-&yaboot-version;.tar.gz"/></para>
+        <para><ulink url="&yaboot-url;"/></para>
       </listitem>
     </varlistentry>
Index: BOOK/materials/sparc/packages.xml
===================================================================
--- BOOK/materials/sparc/packages.xml	(revision 32a86c11a23a9997cb9004ea3d7ab206fbe63f74)
+++ BOOK/materials/sparc/packages.xml	(revision 5d7de1ccdcc8eecfc1c7b22b49bb3ec55148e1fb)
@@ -14,48 +14,35 @@
 
     <varlistentry>
-      <term>ELFtoaout (&elftoaout-version;) - 13 KB:</term>
+      <term>ELFtoaout (&elftoaout-version;) - &elftoaout-size;:</term>
       <listitem>
-        <para><ulink
-        url="http://gd.tuwien.ac.at/opsys/linux/Owl/pool/sources/elftoaout/elftoaout-&elftoaout-version;.tgz"/></para>
+        <para><ulink url="&elftoaout-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Glibc Ports (&glibc-version;) - 429 KB:</term>
+      <term>Linux (&linux-sparc-version;) - &linux-sparc-size;:</term>
       <listitem>
-        <para><ulink
-        url="ftp://sources.redhat.com/pub/glibc/snapshots/glibc-ports-&glibc-version;.tar.bz2"/></para>
+        <para><ulink url="&linux-sparc-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Linux (&linux-sparc-version;) - 35 MB:</term>
+      <term>Linux-Libc-Headers (&linux-libc-headers-sparc-version;) - &linux-libc-headers-sparc-size;:</term>
       <listitem>
-        <para><ulink
-        url="&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-sparc-version;.tar.bz2"/></para>
+        <para><ulink url="&linux-libc-headers-sparc-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Linux-Libc-Headers (&linux-libc-headers-sparc-version;) - 2.6 MB:</term>
+      <term>Silo (&silo-version;) - &silo-size;:</term>
       <listitem>
-        <para><ulink
-        url="http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-&linux-libc-headers-sparc-version;.tar.bz2"/></para>
+        <para><ulink url="&silo-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Silo (&silo-version;) - 144 KB:</term>
+      <term>Silo Loaders (&silo-version;) - &silo-loaders-size;:</term>
       <listitem>
-        <para><ulink
-        url="http://www.ultralinux.nl/silo/download/silo-&silo-version;.tar.bz2"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Silo Loaders (&silo-version;) - 108 KB:</term>
-      <listitem>
-        <para><ulink
-        url="http://www.ultralinux.nl/silo/download/silo-loaders-&silo-version;.tar.gz"/></para>
+        <para><ulink url="&silo-loaders-url;"/></para>
       </listitem>
     </varlistentry>
Index: BOOK/materials/sparc64-64/packages.xml
===================================================================
--- BOOK/materials/sparc64-64/packages.xml	(revision 32a86c11a23a9997cb9004ea3d7ab206fbe63f74)
+++ BOOK/materials/sparc64-64/packages.xml	(revision 5d7de1ccdcc8eecfc1c7b22b49bb3ec55148e1fb)
@@ -14,40 +14,35 @@
 
     <varlistentry>
-      <term>ELFtoaout (&elftoaout-version;) - 13 KB:</term>
+      <term>ELFtoaout (&elftoaout-version;) - &elftoaout-size;:</term>
       <listitem>
-        <para><ulink
-        url="http://gd.tuwien.ac.at/opsys/linux/Owl/pool/sources/elftoaout/elftoaout-&elftoaout-version;.tgz"/></para>
+        <para><ulink url="&elftoaout-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Linux (&linux-sparc64-version;) - 35 MB:</term>
+      <term>Linux (&linux-sparc64-version;) - &linux-sparc64-size;:</term>
       <listitem>
-        <para><ulink
-        url="&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-sparc64-version;.tar.bz2"/></para>
+        <para><ulink url="&linux-sparc64-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Linux-Libc-Headers (&linux-libc-headers-sparc64-version;) - 2.6 MB:</term>
+      <term>Linux-Libc-Headers (&linux-libc-headers-sparc64-version;) - &linux-libc-headers-sparc64-size;:</term>
       <listitem>
-        <para><ulink
-        url="http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-&linux-libc-headers-sparc64-version;.tar.bz2"/></para>
+        <para><ulink url="&linux-libc-headers-sparc64-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Silo (&silo-version;) - 144 KB:</term>
+      <term>Silo (&silo-version;) - &silo-size;:</term>
       <listitem>
-        <para><ulink
-        url="http://www.ultralinux.nl/silo/download/silo-&silo-version;.tar.bz2"/></para>
+        <para><ulink url="&silo-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Silo Loaders (&silo-version;) - 108 KB:</term>
+      <term>Silo Loaders (&silo-version;) - &silo-loaders-size;:</term>
       <listitem>
-        <para><ulink
-        url="http://www.ultralinux.nl/silo/download/silo-loaders-&silo-version;.tar.gz"/></para>
+        <para><ulink url="&silo-loaders-url;"/></para>
       </listitem>
     </varlistentry>
Index: BOOK/materials/sparc64/packages.xml
===================================================================
--- BOOK/materials/sparc64/packages.xml	(revision 32a86c11a23a9997cb9004ea3d7ab206fbe63f74)
+++ BOOK/materials/sparc64/packages.xml	(revision 5d7de1ccdcc8eecfc1c7b22b49bb3ec55148e1fb)
@@ -14,40 +14,35 @@
 
     <varlistentry>
-      <term>ELFtoaout (&elftoaout-version;) - 13 KB:</term>
+      <term>ELFtoaout (&elftoaout-version;) - &elftoaout-size;:</term>
       <listitem>
-        <para><ulink
-        url="http://gd.tuwien.ac.at/opsys/linux/Owl/pool/sources/elftoaout/elftoaout-&elftoaout-version;.tgz"/></para>
+        <para><ulink url="&elftoaout-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Linux (&linux-sparc64-version;) - 35 MB:</term>
+      <term>Linux (&linux-sparc64-version;) - &linux-sparc64-size;:</term>
       <listitem>
-        <para><ulink
-        url="&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-sparc64-version;.tar.bz2"/></para>
+        <para><ulink url="&linux-sparc64-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Linux-Libc-Headers (&linux-libc-headers-sparc64-version;) - 2.6 MB:</term>
+      <term>Linux-Libc-Headers (&linux-libc-headers-sparc64-version;) - &linux-libc-headers-sparc64-size;:</term>
       <listitem>
-        <para><ulink
-        url="http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-&linux-libc-headers-sparc64-version;.tar.bz2"/></para>
+        <para><ulink url="&linux-libc-headers-sparc64-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Silo (&silo-version;) - 144 KB:</term>
+      <term>Silo (&silo-version;) - &silo-size;:</term>
       <listitem>
-        <para><ulink
-        url="http://www.ultralinux.nl/silo/download/silo-&silo-version;.tar.bz2"/></para>
+        <para><ulink url="&silo-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Silo Loaders (&silo-version;) - 108 KB:</term>
+      <term>Silo Loaders (&silo-version;) - &silo-loaders-size;:</term>
       <listitem>
-        <para><ulink
-        url="http://www.ultralinux.nl/silo/download/silo-loaders-&silo-version;.tar.gz"/></para>
+        <para><ulink url="&silo-loaders-url;"/></para>
       </listitem>
     </varlistentry>
Index: BOOK/materials/x86/packages.xml
===================================================================
--- BOOK/materials/x86/packages.xml	(revision 32a86c11a23a9997cb9004ea3d7ab206fbe63f74)
+++ BOOK/materials/x86/packages.xml	(revision 5d7de1ccdcc8eecfc1c7b22b49bb3ec55148e1fb)
@@ -14,24 +14,21 @@
 
     <varlistentry>
-      <term>GRUB (&grub-version;) - 963 KB:</term>
+      <term>GRUB (&grub-version;) - &grub-size;:</term>
       <listitem>
-        <para><ulink
-        url="&alpha-gnu;grub/grub-&grub-version;.tar.gz"/></para>
+        <para><ulink url="&grub-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Linux (&linux-x86-version;) - 35 MB:</term>
+      <term>Linux (&linux-x86-version;) - &linux-x86-size;:</term>
       <listitem>
-        <para><ulink
-        url="&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-x86-version;.tar.bz2"/></para>
+        <para><ulink url="&linux-x86-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Linux-Libc-Headers (&linux-libc-headers-x86-version;) - 2.5 MB:</term>
+      <term>Linux-Libc-Headers (&linux-libc-headers-x86-version;) - &linux-libc-headers-x86-size;:</term>
       <listitem>
-        <para><ulink
-        url="http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-&linux-libc-headers-x86-version;.tar.bz2"/></para>
+        <para><ulink url="&linux-libc-headers-x86-url;"/></para>
       </listitem>
     </varlistentry>
Index: BOOK/materials/x86_64-64/packages.xml
===================================================================
--- BOOK/materials/x86_64-64/packages.xml	(revision 32a86c11a23a9997cb9004ea3d7ab206fbe63f74)
+++ BOOK/materials/x86_64-64/packages.xml	(revision 5d7de1ccdcc8eecfc1c7b22b49bb3ec55148e1fb)
@@ -14,24 +14,21 @@
 
     <varlistentry>
-      <term>GRUB (&grub-version;) - 963 KB:</term>
+      <term>GRUB (&grub-version;) - &grub-size;:</term>
       <listitem>
-        <para><ulink
-        url="&alpha-gnu;grub/grub-&grub-version;.tar.gz"/></para>
+        <para><ulink url="&grub-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Linux (&linux-x86_64-version;) - 35 MB:</term>
+      <term>Linux (&linux-x86_64-version;) - &linux-x86_64-size;:</term>
       <listitem>
-        <para><ulink
-        url="&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-x86_64-version;.tar.bz2"/></para>
+        <para><ulink url="&linux-x86_64-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Linux-Libc-Headers (&linux-libc-headers-x86_64-version;) - 2.5 MB:</term>
+      <term>Linux-Libc-Headers (&linux-libc-headers-x86_64-version;) - &linux-libc-headers-x86_64-size;:</term>
       <listitem>
-        <para><ulink
-        url="http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-&linux-libc-headers-x86_64-version;.tar.bz2"/></para>
+        <para><ulink url="&linux-libc-headers-x86_64-url;"/></para>
       </listitem>
     </varlistentry>
Index: BOOK/materials/x86_64/packages.xml
===================================================================
--- BOOK/materials/x86_64/packages.xml	(revision 32a86c11a23a9997cb9004ea3d7ab206fbe63f74)
+++ BOOK/materials/x86_64/packages.xml	(revision 5d7de1ccdcc8eecfc1c7b22b49bb3ec55148e1fb)
@@ -14,24 +14,21 @@
 
     <varlistentry>
-      <term>GRUB (&grub-version;) - 963 KB:</term>
+      <term>GRUB (&grub-version;) - &grub-size;:</term>
       <listitem>
-        <para><ulink
-        url="&alpha-gnu;grub/grub-&grub-version;.tar.gz"/></para>
+        <para><ulink url="&grub-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Linux (&linux-x86_64-version;) - 35 MB:</term>
+      <term>Linux (&linux-x86_64-version;) - &linux-x86_64-size;:</term>
       <listitem>
-        <para><ulink
-        url="&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-x86_64-version;.tar.bz2"/></para>
+        <para><ulink url="&linux-x86_64-url;"/></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Linux-Libc-Headers (&linux-libc-headers-x86_64-version;) - 2.5 MB:</term>
+      <term>Linux-Libc-Headers (&linux-libc-headers-x86_64-version;) - &linux-libc-headers-x86_64-size;:</term>
       <listitem>
-        <para><ulink
-        url="http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-&linux-libc-headers-x86_64-version;.tar.bz2"/></para>
+        <para><ulink url="&linux-libc-headers-x86_64-url;"/></para>
       </listitem>
     </varlistentry>
