diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 452990367..73d35d41b 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -15,138 +15,127 @@
   <variablelist role="materials">
 
     <varlistentry>
-      <term>Autoconf (&autoconf-version;) - 904 kilobytes (KB):</term>
+      <term>Autoconf (&autoconf-version;) - <token>&autoconf-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&gnu-software;autoconf/"/></para>
-        <para>Download: <ulink
-        url="&gnu;autoconf/autoconf-&autoconf-version;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&autoconf-home;"/></para>
+        <para>Download: <ulink url="&autoconf-url;"/></para>
         <para>MD5 sum: <literal>&autoconf-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Automake (&automake-version;) - 748 KB:</term>
+      <term>Automake (&automake-version;) - <token>&automake-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&gnu-software;automake/"/></para>
-        <para>Download: <ulink
-        url="&gnu;automake/automake-&automake-version;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&automake-home;"/></para>
+        <para>Download: <ulink url="&automake-url;"/></para>
         <para>MD5 sum: <literal>&automake-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Bash (&bash-version;) - 2,475 KB:</term>
+      <term>Bash (&bash-version;) - <token>&bash-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&gnu-software;bash/"/></para>
-        <para>Download: <ulink url="&gnu;bash/bash-&bash-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&bash-home;"/></para>
+        <para>Download: <ulink url="&bash-url;"/></para>
         <para>MD5 sum: <literal>&bash-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Bash Documentation (&bash-doc-version;) - 2,013 KB:</term>
+      <term>Bash Documentation (&bash-doc-version;) - <token>&bash-doc-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink
-        url="&gnu;bash/bash-doc-&bash-doc-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&bash-doc-home;"/></para>
+        <para>Download: <ulink url="&bash-doc-url;"/></para>
         <para>MD5 sum: <literal>&bash-doc-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Berkeley DB (&db-version;) - 7,767 KB:</term>
+      <term>Berkeley DB (&db-version;) - <token>&db-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="http://dev.sleepycat.com/"/></para>
-        <para>Download: <ulink
-        url="http://downloads.sleepycat.com/db-&db-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&db-home;"/></para>
+        <para>Download: <ulink url="&db-url;"/></para>
         <para>MD5 sum: <literal>&db-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Binutils (&binutils-version;) - 12,256 KB:</term>
+      <term>Binutils (&binutils-version;) - <token>&binutils-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="http://sources.redhat.com/binutils/"/></para>
-        <para>Download: <ulink
-        url="&gnu;binutils/binutils-&binutils-version;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&binutils-home;"/></para>
+        <para>Download: <ulink url="&binutils-url;"/></para>
         <para>MD5 sum: <literal>&binutils-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Bison (&bison-version;) - 1,286 KB:</term>
+      <term>Bison (&bison-version;) - <token>&bison-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&gnu-software;bison/"/></para>
-        <para>Download: <ulink
-        url="&gnu;bison/bison-&bison-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&bison-home;"/></para>
+        <para>Download: <ulink url="&bison-url;"/></para>
         <para>MD5 sum: <literal>&bison-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Bzip2 (&bzip2-version;) - 654 KB:</term>
+      <term>Bzip2 (&bzip2-version;) - <token>&bzip2-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="http://www.bzip.org/"/></para>
-        <para>Download: <ulink
-        url="http://www.bzip.org/&bzip2-version;/bzip2-&bzip2-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&bzip2-home;"/></para>
+        <para>Download: <ulink url="&bzip2-url;"/></para>
         <para>MD5 sum: <literal>&bzip2-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Coreutils (&coreutils-version;) - 4,930 KB:</term>
+      <term>Coreutils (&coreutils-version;) - <token>&coreutils-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&gnu-software;coreutils/"/></para>
-        <para>Download: <ulink
-        url="&gnu;coreutils/coreutils-&coreutils-version;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&coreutils-home;"/></para>
+        <para>Download: <ulink url="&coreutils-url;"/></para>
         <para>MD5 sum: <literal>&coreutils-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>DejaGNU (&dejagnu-version;) - 1,056 KB:</term>
+      <term>DejaGNU (&dejagnu-version;) - <token>&dejagnu-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&gnu-software;dejagnu/"/></para>
-        <para>Download: <ulink
-        url="&gnu;dejagnu/dejagnu-&dejagnu-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&dejagnu-home;"/></para>
+        <para>Download: <ulink url="&dejagnu-url;"/></para>
         <para>MD5 sum: <literal>&dejagnu-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Diffutils (&diffutils-version;) - 762 KB:</term>
+      <term>Diffutils (&diffutils-version;) - <token>&diffutils-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&gnu-software;diffutils/"/></para>
-        <para>Download: <ulink
-        url="&gnu;diffutils/diffutils-&diffutils-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&diffutils-home;"/></para>
+        <para>Download: <ulink url="&diffutils-url;"/></para>
         <para>MD5 sum: <literal>&diffutils-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>E2fsprogs (&e2fsprogs-version;) - 3,537 KB:</term>
+      <term>E2fsprogs (&e2fsprogs-version;) - <token>&e2fsprogs-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="http://e2fsprogs.sourceforge.net/"/></para>
-        <para>Download: <ulink
-        url="&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz?download"/></para>
+        <para>Home page: <ulink url="&e2fsprogs-home;"/></para>
+        <para>Download: <ulink url="&e2fsprogs-url;"/></para>
         <para>MD5 sum: <literal>&e2fsprogs-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Expect (&expect-version;) - 514 KB:</term>
+      <term>Expect (&expect-version;) - <token>&expect-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="http://expect.nist.gov/"/></para>
-        <para>Download: <ulink
-        url="http://expect.nist.gov/src/expect-&expect-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&expect-home;"/></para>
+        <para>Download: <ulink url="&expect-url;"/></para>
         <para>MD5 sum: <literal>&expect-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>File (&file-version;) - 544 KB:</term>
+      <term>File (&file-version;) - <token>&file-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink
-        url="ftp://ftp.gw.com/mirrors/pub/unix/file/file-&file-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&file-home;"/></para>
+        <para>Download: <ulink url="&file-url;"/></para>
         <para>MD5 sum: <literal>&file-md5;</literal></para>
 
         <note>
@@ -161,264 +150,244 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Findutils (&findutils-version;) - 1,097 KB:</term>
+      <term>Findutils (&findutils-version;) - <token>&findutils-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&gnu-software;findutils/"/></para>
-        <para>Download: <ulink
-        url="&gnu;findutils/findutils-&findutils-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&findutils-home;"/></para>
+        <para>Download: <ulink url="&findutils-url;"/></para>
         <para>MD5 sum: <literal>&findutils-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Flex (&flex-version;) - 680 KB:</term>
+      <term>Flex (&flex-version;) - <token>&flex-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="http://flex.sourceforge.net"/></para>
-        <para>Download: <ulink
-        url="&sourceforge;flex/flex-&flex-version;.tar.bz2?download"/></para>
+        <para>Home page: <ulink url="&flex-home;"/></para>
+        <para>Download: <ulink url="&flex-url;"/></para>
         <para>MD5 sum: <literal>&flex-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Gawk (&gawk-version;) - 1,716 KB:</term>
+      <term>Gawk (&gawk-version;) - <token>&gawk-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&gnu-software;gawk/"/></para>
-        <para>Download: <ulink url="&gnu;gawk/gawk-&gawk-version;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&gawk-home;"/></para>
+        <para>Download: <ulink url="&gawk-url;"/></para>
         <para>MD5 sum: <literal>&gawk-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>GCC (&gcc-version;) - 32,208 KB:</term>
+      <term>GCC (&gcc-version;) - <token>&gcc-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="http://gcc.gnu.org/"/></para>
-        <para>Download: <ulink
-        url="&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&gcc-home;"/></para>
+        <para>Download: <ulink url="&gcc-url;"/></para>
         <para>MD5 sum: <literal>&gcc-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Gettext (&gettext-version;) - 6,940 KB:</term>
+      <term>Gettext (&gettext-version;) - <token>&gettext-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&gnu-software;gettext/"/></para>
-        <para>Download: <ulink
-        url="&gnu;gettext/gettext-&gettext-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&gettext-home;"/></para>
+        <para>Download: <ulink url="&gettext-url;"/></para>
         <para>MD5 sum: <literal>&gettext-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Glibc (&glibc-version;) - 13,687 KB:</term>
+      <term>Glibc (&glibc-version;) - <token>&glibc-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&gnu-software;libc/"/></para>
-        <para>Download: <ulink
-        url="&gnu;glibc/glibc-&glibc-version;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&glibc-home;"/></para>
+        <para>Download: <ulink url="&glibc-url;"/></para>
         <para>MD5 sum: <literal>&glibc-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Glibc LibIDN add-on (&glibc-version;) - 99 KB:</term>
+      <term>Glibc LibIDN add-on (&glibc-libidn-version;) - <token>&glibc-libidn-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink
-        url="&gnu;glibc/glibc-libidn-&glibc-version;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&glibc-libidn-home;"/></para>
+        <para>Download: <ulink url="&glibc-libidn-url;"/></para>
         <para>MD5 sum: <literal>&glibc-libidn-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Grep (&grep-version;) - 516 KB:</term>
+      <term>Grep (&grep-version;) - <token>&grep-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&gnu-software;grep/"/></para>
-        <para>Download: <ulink url="&gnu;grep/grep-&grep-version;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&grep-home;"/></para>
+        <para>Download: <ulink url="&grep-url;"/></para>
         <para>MD5 sum: <literal>&grep-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Groff (&groff-version;) - 2,208 KB:</term>
+      <term>Groff (&groff-version;) - <token>&groff-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&gnu-software;groff/"/></para>
-        <para>Download: <ulink
-        url="&gnu;groff/groff-&groff-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&groff-home;"/></para>
+        <para>Download: <ulink url="&groff-url;"/></para>
         <para>MD5 sum: <literal>&groff-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>GRUB (&grub-version;) - 950 KB:</term>
+      <term>GRUB (&grub-version;) - <token>&grub-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&gnu-software;grub/"/></para>
-        <para>Download: <ulink
-        url="&alpha-gnu;grub/grub-&grub-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&grub-home;"/></para>
+        <para>Download: <ulink url="&grub-url;"/></para>
         <para>MD5 sum: <literal>&grub-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Gzip (&gzip-version;) - 324 KB:</term>
+      <term>Gzip (&gzip-version;) - <token>&gzip-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="http://www.gzip.org/"/></para>
-        <para>Download: <ulink
-        url="&alpha-gnu;gzip/gzip-&gzip-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&gzip-home;"/></para>
+        <para>Download: <ulink url="&gzip-url;"/></para>
         <para>MD5 sum: <literal>&gzip-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Iana-Etc (&iana-etc-version;) - 184 KB:</term>
+      <term>Iana-Etc (&iana-etc-version;) - <token>&iana-etc-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink
-        url="http://www.sethwklein.net/projects/iana-etc/"/></para>
-        <para>Download: <ulink
-        url="http://www.sethwklein.net/projects/iana-etc/downloads/iana-etc-&iana-etc-version;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&iana-etc-home;"/></para>
+        <para>Download: <ulink url="&iana-etc-url;"/></para>
         <para>MD5 sum: <literal>&iana-etc-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Inetutils (&inetutils-version;) - 1,019 KB:</term>
+      <term>Inetutils (&inetutils-version;) - <token>&inetutils-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&gnu-software;inetutils/"/></para>
-        <para>Download: <ulink
-        url="&gnu;inetutils/inetutils-&inetutils-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&inetutils-home;"/></para>
+        <para>Download: <ulink url="&inetutils-url;"/></para>
         <para>MD5 sum: <literal>&inetutils-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>IPRoute2 (&iproute2-version;) - 378 KB:</term>
+      <term>IPRoute2 (&iproute2-version;) - <token>&iproute2-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink
-        url="http://linux-net.osdl.org/index.php/Iproute2"/></para>
-        <para>Download: <ulink
-        url="http://developer.osdl.org/dev/iproute2/download/iproute2-&iproute2-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&iproute2-home;"/></para>
+        <para>Download: <ulink url="&iproute2-url;"/></para>
         <para>MD5 sum: <literal>&iproute2-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Kbd (&kbd-version;) - 618 KB:</term>
+      <term>Kbd (&kbd-version;) - <token>&kbd-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink
-        url="&kernel;linux/utils/kbd/kbd-&kbd-version;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&kbd-home;"/></para>
+        <para>Download: <ulink url="&kbd-url;"/></para>
         <para>MD5 sum: <literal>&kbd-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Less (&less-version;) - 286 KB:</term>
+      <term>Less (&less-version;) - <token>&less-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink
-        url="http://www.greenwoodsoftware.com/less/"/></para>
-        <para>Download: <ulink
-        url="http://www.greenwoodsoftware.com/less/less-&less-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&less-home;"/></para>
+        <para>Download: <ulink url="&less-url;"/></para>
         <para>MD5 sum: <literal>&less-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>LFS-Bootscripts (&lfs-bootscripts-version;) - 24 KB:</term>
+      <term>LFS-Bootscripts (&lfs-bootscripts-version;) - <token>&lfs-bootscripts-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink
-        url="http://www.linuxfromscratch.org/~dj/bootscripts/lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&lfs-bootscripts-home;"/></para>
+        <para>Download: <ulink url="&lfs-bootscripts-url;"/></para>
         <para>MD5 sum: <literal>&lfs-bootscripts-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Libtool (&libtool-version;) - 2,856 KB:</term>
+      <term>Libtool (&libtool-version;) - <token>&libtool-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&gnu-software;libtool/"/></para>
-        <para>Download: <ulink
-        url="&gnu;libtool/libtool-&libtool-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&libtool-home;"/></para>
+        <para>Download: <ulink url="&libtool-url;"/></para>
         <para>MD5 sum: <literal>&libtool-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Linux (&linux-version;) - 39,880 KB:</term>
+      <term>Linux (&linux-version;) - <token>&linux-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="http://www.kernel.org/"/></para>
-        <para>Download: <ulink
-        url="&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&linux-home;"/></para>
+        <para>Download: <ulink url="&linux-url;"/></para>
         <para>MD5 sum: <literal>&linux-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Linux-Libc-Headers (&linux-libc-headers-version;) - 2,481 KB:</term>
+      <term>Linux-Libc-Headers (&linux-libc-headers-version;) - <token>&linux-libc-headers-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink
-        url="http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-&linux-libc-headers-version;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&linux-libc-headers-home;"/></para>
+        <para>Download: <ulink url="&linux-libc-headers-url;"/></para>
         <para>MD5 sum: <literal>&linux-libc-headers-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>M4 (&m4-version;) - 376 KB:</term>
+      <term>M4 (&m4-version;) - <token>&m4-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&gnu-software;m4/"/></para>
-        <para>Download: <ulink url="&gnu;m4/m4-&m4-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&m4-home;"/></para>
+        <para>Download: <ulink url="&m4-url;"/></para>
         <para>MD5 sum: <literal>&m4-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Make (&make-version;) - 900 KB:</term>
+      <term>Make (&make-version;) - <token>&make-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&gnu-software;make/"/></para>
-        <para>Download: <ulink url="&gnu;make/make-&make-version;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&make-home;"/></para>
+        <para>Download: <ulink url="&make-url;"/></para>
         <para>MD5 sum: <literal>&make-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Man-DB (&man-db-version;) - 798 KB:</term>
+      <term>Man-DB (&man-db-version;) - <token>&man-db-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="http://www.nongnu.org/man-db/"/></para>
-        <para>Download: <ulink
-        url="http://savannah.nongnu.org/download/man-db/man-db-&man-db-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&man-db-home;"/></para>
+        <para>Download: <ulink url="&man-db-url;"/></para>
         <para>MD5 sum: <literal>&man-db-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Man-pages (&man-pages-version;) - 1,746 KB:</term>
+      <term>Man-pages (&man-pages-version;) - <token>&man-pages-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink
-        url="&kernel;linux/docs/manpages/man-pages-&man-pages-version;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&man-pages-home;"/></para>
+        <para>Download: <ulink url="&man-pages-url;"/></para>
         <para>MD5 sum: <literal>&man-pages-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Mktemp (&mktemp-version;) - 69 KB:</term>
+      <term>Mktemp (&mktemp-version;) - <token>&mktemp-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="http://www.mktemp.org/"/></para>
-        <para>Download: <ulink
-        url="ftp://ftp.mktemp.org/pub/mktemp/mktemp-&mktemp-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&mktemp-home;"/></para>
+        <para>Download: <ulink url="&mktemp-url;"/></para>
         <para>MD5 sum: <literal>&mktemp-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Module-Init-Tools (&module-init-tools-version;) - 166 KB:</term>
+      <term>Module-Init-Tools (&module-init-tools-version;) - <token>&module-init-tools-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink
-        url="&kernel;linux/utils/kernel/module-init-tools/module-init-tools-&module-init-tools-version;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&module-init-tools-home;"/></para>
+        <para>Download: <ulink url="&module-init-tools-url;"/></para>
         <para>MD5 sum: <literal>&module-init-tools-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Ncurses (&ncurses-version;) - 2,260 KB:</term>
+      <term>Ncurses (&ncurses-version;) - <token>&ncurses-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="http://dickey.his.com/ncurses/"/></para>
-        <para>Download: <ulink
-        url="ftp://invisible-island.net/ncurses/ncurses-&ncurses-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&ncurses-home;"/></para>
+        <para>Download: <ulink url="&ncurses-url;"/></para>
         <para>MD5 sum: <literal>&ncurses-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -440,70 +409,64 @@
     -->
 
     <varlistentry>
-      <term>Patch (&patch-version;) - 183 KB:</term>
+      <term>Patch (&patch-version;) - <token>&patch-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&gnu-software;patch/"/></para>
-        <para>Download: <ulink
-        url="&gnu;patch/patch-&patch-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&patch-home;"/></para>
+        <para>Download: <ulink url="&patch-url;"/></para>
         <para>MD5 sum: <literal>&patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Perl (&perl-version;) - 9,887 KB:</term>
+      <term>Perl (&perl-version;) - <token>&perl-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="http://www.perl.com/"/></para>
-        <para>Download: <ulink
-        url="http://ftp.funet.fi/pub/CPAN/src/perl-&perl-version;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&perl-home;"/></para>
+        <para>Download: <ulink url="&perl-url;"/></para>
         <para>MD5 sum: <literal>&perl-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Procps (&procps-version;) - 273 KB:</term>
+      <term>Procps (&procps-version;) - <token>&procps-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="http://procps.sourceforge.net/"/></para>
-        <para>Download: <ulink
-        url="http://procps.sourceforge.net/procps-&procps-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&procps-home;"/></para>
+        <para>Download: <ulink url="&procps-url;"/></para>
         <para>MD5 sum: <literal>&procps-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Psmisc (&psmisc-version;) - 239 KB:</term>
+      <term>Psmisc (&psmisc-version;) - <token>&psmisc-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="http://psmisc.sourceforge.net/"/></para>
-        <para>Download: <ulink
-        url="&sourceforge;psmisc/psmisc-&psmisc-version;.tar.gz?download"/></para>
+        <para>Home page: <ulink url="&psmisc-home;"/></para>
+        <para>Download: <ulink url="&psmisc-url;"/></para>
         <para>MD5 sum: <literal>&psmisc-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Readline (&readline-version;) - 1,983 KB:</term>
+      <term>Readline (&readline-version;) - <token>&readline-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink
-        url="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"/></para>
-        <para>Download: <ulink
-        url="&gnu;readline/readline-&readline-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&readline-home;"/></para>
+        <para>Download: <ulink url="&readline-url;"/></para>
         <para>MD5 sum: <literal>&readline-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Sed (&sed-version;) - 781 KB:</term>
+      <term>Sed (&sed-version;) - <token>&sed-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&gnu-software;sed/"/></para>
-        <para>Download: <ulink url="&gnu;sed/sed-&sed-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&sed-home;"/></para>
+        <para>Download: <ulink url="&sed-url;"/></para>
         <para>MD5 sum: <literal>&sed-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Shadow (&shadow-version;) - 1,265 KB:</term>
+      <term>Shadow (&shadow-version;) - <token>&shadow-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink
-        url="ftp://ftp.pld.org.pl/software/shadow/shadow-&shadow-version;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&shadow-home;"/></para>
+        <para>Download: <ulink url="&shadow-url;"/></para>
         <para>MD5 sum: <literal>&shadow-md5;</literal></para>
 
         <note>
@@ -518,114 +481,106 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Sysklogd (&sysklogd-version;) - 80 KB:</term>
+      <term>Sysklogd (&sysklogd-version;) - <token>&sysklogd-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink
-        url="http://www.infodrom.org/projects/sysklogd/"/></para>
-        <para>Download: <ulink
-        url="http://www.infodrom.org/projects/sysklogd/download/sysklogd-&sysklogd-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&sysklogd-home;"/></para>
+        <para>Download: <ulink url="&sysklogd-url;"/></para>
         <para>MD5 sum: <literal>&sysklogd-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Sysvinit (&sysvinit-version;) - 97 KB:</term>
+      <term>Sysvinit (&sysvinit-version;) - <token>&sysvinit-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink
-        url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-&sysvinit-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&sysvinit-home;"/></para>
+        <para>Download: <ulink url="&sysvinit-url;"/></para>
         <para>MD5 sum: <literal>&sysvinit-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Tar (&tar-version;) - 1,574 KB:</term>
+      <term>Tar (&tar-version;) - <token>&tar-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&gnu-software;tar/"/></para>
-        <para>Download: <ulink url="&gnu;tar/tar-&tar-version;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&tar-home;"/></para>
+        <para>Download: <ulink url="&tar-url;"/></para>
         <para>MD5 sum: <literal>&tar-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Tcl (&tcl-version;) - 3,432 KB:</term>
+      <term>Tcl (&tcl-version;) - <token>&tcl-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="http://tcl.sourceforge.net/"/></para>
-        <para>Download: <ulink
-        url="&sourceforge;tcl/tcl&tcl-version;-src.tar.gz?download"/></para>
+        <para>Home page: <ulink url="&tcl-home;"/></para>
+        <para>Download: <ulink url="&tcl-url;"/></para>
         <para>MD5 sum: <literal>&tcl-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Texinfo (&texinfo-version;) - 1,487 KB:</term>
+      <term>Texinfo (&texinfo-version;) - <token>&texinfo-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&gnu-software;texinfo/"/></para>
-        <para>Download: <ulink
-        url="&gnu;texinfo/texinfo-&texinfo-version;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&texinfo-home;"/></para>
+        <para>Download: <ulink url="&texinfo-url;"/></para>
         <para>MD5 sum: <literal>&texinfo-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Udev (&udev-version;) - 189 KB:</term>
+      <term>Udev (&udev-version;) - <token>&udev-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink
-        url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"/></para>
-        <para>Download: <ulink
-        url="&kernel;linux/utils/kernel/hotplug/udev-&udev-version;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&udev-home;"/></para>
+        <para>Download: <ulink url="&udev-url;"/></para>
         <para>MD5 sum: <literal>&udev-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Udev Configuration Tarball - 4 KB:</term>
+      <term>Udev Configuration Tarball - <token>&udev-config-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink
-        url="http://downloads.linuxfromscratch.org/&udev-config;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&udev-config-home;"/></para>
+        <para>Download: <ulink url="&udev-config-url;"/></para>
         <para>MD5 sum: <literal>&udev-config-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Util-linux (&util-linux-version;) - 1,339 KB:</term>
+      <term>Util-linux (&util-linux-version;) - <token>&util-linux-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink
-        url="&kernel;linux/utils/util-linux/util-linux-&util-linux-version;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&util-linux-home;"/></para>
+        <para>Download: <ulink url="&util-linux-url;"/></para>
         <para>MD5 sum: <literal>&util-linux-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Vim (&vim-version;) - 3,650 KB:</term>
+      <term>Vim (&vim-version;) - <token>&vim-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="http://www.vim.org"/></para>
-        <para>Download: <ulink
-        url="ftp://ftp.vim.org/pub/vim/unix/vim-&vim-version;.tar.bz2"/></para>
+        <para>Home page: <ulink url="&vim-home;"/></para>
+        <para>Download: <ulink url="&vim-url;"/></para>
         <para>MD5 sum: <literal>&vim-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Vim (&vim-version;) language files (optional) - 1,093 KB:</term>
+      <term>Vim (&vim-lang-version;) language files (optional) - <token>&vim-lang-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink
-        url="ftp://ftp.vim.org/pub/vim/extra/vim-&vim-version;-lang.tar.gz"/></para>
+        <para>Home page: <ulink url="&vim-lang-home;"/></para>
+        <para>Download: <ulink url="&vim-lang-url;"/></para>
         <para>MD5 sum: <literal>&vim-lang-md5;</literal></para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term>Zlib (&zlib-version;) - 485 KB:</term>
+      <term>Zlib (&zlib-version;) - <token>&zlib-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="http://www.zlib.net/"/></para>
-        <para>Download: <ulink
-        url="http://www.zlib.net/zlib-&zlib-version;.tar.gz"/></para>
+        <para>Home page: <ulink url="&zlib-home;"/></para>
+        <para>Download: <ulink url="&zlib-url;"/></para>
         <para>MD5 sum: <literal>&zlib-md5;</literal></para>
       </listitem>
     </varlistentry>
 
   </variablelist>
 
-  <para>Total size of these packages: 178 MB</para>
+  <para>Total size of these packages: <returnvalue/></para>
 
 </sect1>
diff --git a/packages.ent b/packages.ent
index 152f8ac38..9de555deb 100644
--- a/packages.ent
+++ b/packages.ent
@@ -4,519 +4,518 @@
 
 
 <!ENTITY autoconf-version "2.59">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY autoconf-size "904 KB">
+<!ENTITY autoconf-url "&gnu;autoconf/autoconf-&autoconf-version;.tar.bz2">
 <!ENTITY autoconf-md5 "1ee40f7a676b3cfdc0e3f7cd81551b5f">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY autoconf-home "&gnu-software;autoconf/">
+<!ENTITY autoconf-ch6-du "">
+<!ENTITY autoconf-ch6-sbu "">
 
 <!ENTITY automake-version "1.9.6">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY automake-size "748 KB">
+<!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.bz2">
 <!ENTITY automake-md5 "c11b8100bb311492d8220378fd8bf9e0">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY automake-home "&gnu-software;automake/">
+<!ENTITY automake-ch6-du "">
+<!ENTITY automake-ch6-sbu "">
 
 <!ENTITY bash-version "3.1">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY bash-size "2,475 KB">
+<!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz">
 <!ENTITY bash-md5 "ef5304c4b22aaa5088972c792ed45d72">
-<!ENTITY -home "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
-
+<!ENTITY bash-home "&gnu-software;bash/">
+<!ENTITY bash-ch5-du "">
+<!ENTITY bash-ch5-sbu "">
+<!ENTITY bash-ch6-du "">
+<!ENTITY bash-ch6-sbu "">
 <!ENTITY bash-doc-version "&bash-version;">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY bash-doc-size "2,013 KB">
+<!ENTITY bash-doc-url "&gnu;bash/bash-doc-&bash-doc-version;.tar.gz">
 <!ENTITY bash-doc-md5 "a8c517c6a7b21b8b855190399c5935ae">
-<!ENTITY -home "">
+<!ENTITY bash-doc-home " ">
 
 <!ENTITY binutils-version "2.16.1">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY binutils-size "12,256 KB">
+<!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
 <!ENTITY binutils-md5 "6a9d529efb285071dad10e1f3d2b2967">
-<!ENTITY -home "">
-<!ENTITY -ch5p1-du "">
-<!ENTITY -ch5p1-sbu "">
-<!ENTITY -ch5p2-du "">
-<!ENTITY -ch5p2-sbu "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY binutils-home "http://sources.redhat.com/binutils/">
+<!ENTITY binutils-ch5p1-du "">
+<!ENTITY binutils-ch5p1-sbu "">
+<!ENTITY binutils-ch5p2-du "">
+<!ENTITY binutils-ch5p2-sbu "">
+<!ENTITY binutils-ch6-du "">
+<!ENTITY binutils-ch6-sbu "">
 
 <!ENTITY bison-version "2.1">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY bison-size "1,286 KB">
+<!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.gz">
 <!ENTITY bison-md5 "b1468d49c1357aebcd1de6ef12cbf3e8">
-<!ENTITY -home "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY bison-home "&gnu-software;bison/">
+<!ENTITY bison-ch5-du "">
+<!ENTITY bison-ch5-sbu "">
+<!ENTITY bison-ch6-du "">
+<!ENTITY bison-ch6-sbu "">
 
 <!ENTITY bzip2-version "1.0.3">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY bzip2-size "654 KB">
+<!ENTITY bzip2-url "http://www.bzip.org/&bzip2-version;/bzip2-&bzip2-version;.tar.gz">
 <!ENTITY bzip2-md5 "8a716bebecb6e647d2e8a29ea5d8447f">
-<!ENTITY -home "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY bzip2-home "http://www.bzip.org/">
+<!ENTITY bzip2-ch5-du "">
+<!ENTITY bzip2-ch5-sbu "">
+<!ENTITY bzip2-ch6-du "">
+<!ENTITY bzip2-ch6-sbu "">
 
 <!ENTITY coreutils-version "5.94">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY coreutils-size "4,930 KB">
+<!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.bz2">
 <!ENTITY coreutils-md5 "11985c8345371546da8ff13f7efae359">
-<!ENTITY -home "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY coreutils-home "&gnu-software;coreutils/">
+<!ENTITY coreutils-ch5-du "">
+<!ENTITY coreutils-ch5-sbu "">
+<!ENTITY coreutils-ch6-du "">
+<!ENTITY coreutils-ch6-sbu "">
 
 <!ENTITY db-version "4.4.20">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY db-size "7,767 KB">
+<!ENTITY db-url "http://downloads.sleepycat.com/db-&db-version;.tar.gz">
 <!ENTITY db-md5 "d84dff288a19186b136b0daf7067ade3">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY db-home "http://dev.sleepycat.com/">
+<!ENTITY db-ch6-du "">
+<!ENTITY db-ch6-sbu "">
 
 <!ENTITY dejagnu-version "1.4.4">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY dejagnu-size "1,056 KB">
+<!ENTITY dejagnu-url "&gnu;dejagnu/dejagnu-&dejagnu-version;.tar.gz">
 <!ENTITY dejagnu-md5 "053f18fd5d00873de365413cab17a666">
-<!ENTITY -home "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
+<!ENTITY dejagnu-home "&gnu-software;dejagnu/">
+<!ENTITY dejagnu-ch5-du "">
+<!ENTITY dejagnu-ch5-sbu "">
 
 <!ENTITY diffutils-version "2.8.1">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY diffutils-size "762 KB">
+<!ENTITY diffutils-url "&gnu;diffutils/diffutils-&diffutils-version;.tar.gz">
 <!ENTITY diffutils-md5 "71f9c5ae19b60608f6c7f162da86a428">
-<!ENTITY -home "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY diffutils-home "&gnu-software;diffutils/">
+<!ENTITY diffutils-ch5-du "">
+<!ENTITY diffutils-ch5-sbu "">
+<!ENTITY diffutils-ch6-du "">
+<!ENTITY diffutils-ch6-sbu "">
 
 <!ENTITY e2fsprogs-version "1.38">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY e2fsprogs-size "3,537 KB">
+<!ENTITY e2fsprogs-url "&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz?download">
 <!ENTITY e2fsprogs-md5 "d774d4412bfb80d12cf3a4fdfd59de5a">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
+<!ENTITY e2fsprogs-ch6-du "">
+<!ENTITY e2fsprogs-ch6-sbu "">
 
 <!ENTITY expect-version "5.43.0">
 <!ENTITY expect-lib-version "5.43">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY expect-size "514 KB">
+<!ENTITY expect-url "http://expect.nist.gov/src/expect-&expect-version;.tar.gz">
 <!ENTITY expect-md5 "43e1dc0e0bc9492cf2e1a6f59f276bc3">
-<!ENTITY -home "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
+<!ENTITY expect-home "http://expect.nist.gov/">
+<!ENTITY expect-ch5-du "">
+<!ENTITY expect-ch5-sbu "">
 
 <!ENTITY file-version "4.17">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY file-size "544 KB">
+<!ENTITY file-url "ftp://ftp.gw.com/mirrors/pub/unix/file/file-&file-version;.tar.gz">
 <!ENTITY file-md5 "50919c65e0181423d66bb25d7fe7b0fd">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY file-home " ">
+<!ENTITY file-ch6-du "">
+<!ENTITY file-ch6-sbu "">
 
 <!ENTITY findutils-version "4.2.27">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY findutils-size "1,097 KB">
+<!ENTITY findutils-url "&gnu;findutils/findutils-&findutils-version;.tar.gz">
 <!ENTITY findutils-md5 "f1e0ddf09f28f8102ff3b90f3b5bc920">
-<!ENTITY -home "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY findutils-home "&gnu-software;findutils/">
+<!ENTITY findutils-ch5-du "">
+<!ENTITY findutils-ch5-sbu "">
+<!ENTITY findutils-ch6-du "">
+<!ENTITY findutils-ch6-sbu "">
 
 <!ENTITY flex-version "2.5.33">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY flex-size "680 KB">
+<!ENTITY flex-url "&sourceforge;flex/flex-&flex-version;.tar.bz2?download">
 <!ENTITY flex-md5 "343374a00b38d9e39d1158b71af37150">
-<!ENTITY -home "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY flex-home "http://flex.sourceforge.net">
+<!ENTITY flex-ch5-du "">
+<!ENTITY flex-ch5-sbu "">
+<!ENTITY flex-ch6-du "">
+<!ENTITY flex-ch6-sbu "">
 
 <!ENTITY gawk-version "3.1.5">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY gawk-size "1,716 KB">
+<!ENTITY gawk-url "&gnu;gawk/gawk-&gawk-version;.tar.bz2">
 <!ENTITY gawk-md5 "5703f72d0eea1d463f735aad8222655f">
-<!ENTITY -home "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY gawk-home "&gnu-software;gawk/">
+<!ENTITY gawk-ch5-du "">
+<!ENTITY gawk-ch5-sbu "">
+<!ENTITY gawk-ch6-du "">
+<!ENTITY gawk-ch6-sbu "">
 
 <!ENTITY gcc-version "4.0.3">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY gcc-size "32,208 KB">
+<!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
 <!ENTITY gcc-md5 "6ff1af12c53cbb3f79b27f2d6a9a3d50">
-<!ENTITY -home "">
-<!ENTITY -ch5p1-du "">
-<!ENTITY -ch5p1-sbu "">
-<!ENTITY -ch5p2-du "">
-<!ENTITY -ch5p2-sbu "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY gcc-home "http://gcc.gnu.org/">
+<!ENTITY gcc-ch5p1-du "">
+<!ENTITY gcc-ch5p1-sbu "">
+<!ENTITY gcc-ch5p2-du "">
+<!ENTITY gcc-ch5p2-sbu "">
+<!ENTITY gcc-ch6-du "">
+<!ENTITY gcc-ch6-sbu "">
 
 <!ENTITY gettext-version "0.14.5">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY gettext-size "6,940 KB">
+<!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.gz">
 <!ENTITY gettext-md5 "e2f6581626a22a0de66dce1d81d00de3">
-<!ENTITY -home "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY gettext-home "&gnu-software;gettext/">
+<!ENTITY gettext-ch5-du "">
+<!ENTITY gettext-ch5-sbu "">
+<!ENTITY gettext-ch6-du "">
+<!ENTITY gettext-ch6-sbu "">
 
 <!ENTITY glibc-version "2.3.6">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY glibc-size "13,687 KB">
+<!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.bz2">
 <!ENTITY glibc-md5 "bfdce99f82d6dbcb64b7f11c05d6bc96">
-<!ENTITY -home "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
-
+<!ENTITY glibc-home "&gnu-software;libc/">
+<!ENTITY glibc-ch5-du "">
+<!ENTITY glibc-ch5-sbu "">
+<!ENTITY glibc-ch6-du "">
+<!ENTITY glibc-ch6-sbu "">
 <!ENTITY glibc-libidn-version "&glibc-version;">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY glibc-libidn-size "99 KB">
+<!ENTITY glibc-libidn-url "&gnu;glibc/glibc-libidn-&glibc-libidn-version;.tar.bz2">
 <!ENTITY glibc-libidn-md5 "49dbe06ce830fc73874d6b38bdc5b4db">
-<!ENTITY -home "">
+<!ENTITY glibc-libidn-home " ">
 
 <!ENTITY grep-version "2.5.1a">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY grep-size "516 KB">
+<!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.bz2">
 <!ENTITY grep-md5 "52202fe462770fa6be1bb667bd6cf30c">
-<!ENTITY -home "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY grep-home "&gnu-software;grep/">
+<!ENTITY grep-ch5-du "">
+<!ENTITY grep-ch5-sbu "">
+<!ENTITY grep-ch6-du "">
+<!ENTITY grep-ch6-sbu "">
 
 <!ENTITY groff-version "1.18.1.1">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY groff-size "2,208 KB">
+<!ENTITY groff-url "&gnu;groff/groff-&groff-version;.tar.gz">
 <!ENTITY groff-md5 "511dbd64b67548c99805f1521f82cc5e">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY groff-home "&gnu-software;groff/">
+<!ENTITY groff-ch6-du "">
+<!ENTITY groff-ch6-sbu "">
 
 <!ENTITY grub-version "0.97">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY grub-size "950 KB">
+<!ENTITY grub-url "&alpha-gnu;grub/grub-&grub-version;.tar.gz">
 <!ENTITY grub-md5 "cd3f3eb54446be6003156158d51f4884">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY grub-home "&gnu-software;grub/">
+<!ENTITY grub-ch6-du "">
+<!ENTITY grub-ch6-sbu "">
 
 <!ENTITY gzip-version "1.3.5">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY gzip-size "324 KB">
+<!ENTITY gzip-url "&alpha-gnu;gzip/gzip-&gzip-version;.tar.gz">
 <!ENTITY gzip-md5 "3d6c191dfd2bf307014b421c12dc8469">
-<!ENTITY -home "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY gzip-home "http://www.gzip.org/">
+<!ENTITY gzip-ch5-du "">
+<!ENTITY gzip-ch5-sbu "">
+<!ENTITY gzip-ch6-du "">
+<!ENTITY gzip-ch6-sbu "">
 
 <!ENTITY iana-etc-version "2.10">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY iana-etc-size "184 KB">
+<!ENTITY iana-etc-url "http://www.sethwklein.net/projects/iana-etc/downloads/iana-etc-&iana-etc-version;.tar.bz2">
 <!ENTITY iana-etc-md5 "53dea53262b281322143c744ca60ffbb">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY iana-etc-home "http://www.sethwklein.net/projects/iana-etc/">
+<!ENTITY iana-etc-ch6-du "">
+<!ENTITY iana-etc-ch6-sbu "">
 
 <!ENTITY inetutils-version "1.4.2">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY inetutils-size "1,019 KB">
+<!ENTITY inetutils-url "&gnu;inetutils/inetutils-&inetutils-version;.tar.gz">
 <!ENTITY inetutils-md5 "df0909a586ddac2b7a0d62795eea4206">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY inetutils-home "&gnu-software;inetutils/">
+<!ENTITY inetutils-ch6-du "">
+<!ENTITY inetutils-ch6-sbu "">
 
 <!ENTITY iproute2-version "2.6.16-060323">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY iproute2-size "378 KB">
+<!ENTITY iproute2-url "http://developer.osdl.org/dev/iproute2/download/iproute2-&iproute2-version;.tar.gz">
 <!ENTITY iproute2-md5 "f31d4516b35bbfeaa72c762f5959e97c">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY iproute2-home "http://linux-net.osdl.org/index.php/Iproute2">
+<!ENTITY iproute2-ch6-du "">
+<!ENTITY iproute2-ch6-sbu "">
 
 <!ENTITY kbd-version "1.12">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY kbd-size "618 KB">
+<!ENTITY kbd-url "&kernel;linux/utils/kbd/kbd-&kbd-version;.tar.bz2">
 <!ENTITY kbd-md5 "069d1175b4891343b107a8ac2b4a39f6">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY kbd-home " ">
+<!ENTITY kbd-ch6-du "">
+<!ENTITY kbd-ch6-sbu "">
 
 <!ENTITY less-version "394">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY less-size "286 KB">
+<!ENTITY less-url "http://www.greenwoodsoftware.com/less/less-&less-version;.tar.gz">
 <!ENTITY less-md5 "a9f072ccefa0d315b325f3e9cdbd4b97">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY less-home "http://www.greenwoodsoftware.com/less/">
+<!ENTITY less-ch6-du "">
+<!ENTITY less-ch6-sbu "">
 
 <!ENTITY lfs-bootscripts-version "20060417">
+<!ENTITY lfs-bootscripts-size "24 KB">
+<!ENTITY lfs-bootscripts-url "http://www.linuxfromscratch.org/~dj/bootscripts/lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
 <!ENTITY lfs-bootscripts-md5 "71245258e1ee0a69c231b87d92530a36">
-<!ENTITY -home "">
-<!ENTITY -ch7-du "">
-<!ENTITY -ch7-sbu "">
+<!ENTITY lfs-bootscripts-home " ">
+<!ENTITY lfs-bootscripts-ch7-du "">
+<!ENTITY lfs-bootscripts-ch7-sbu "">
 
 <!ENTITY libtool-version "1.5.22">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY libtool-size "2,856 KB">
+<!ENTITY libtool-url "&gnu;libtool/libtool-&libtool-version;.tar.gz">
 <!ENTITY libtool-md5 "8e0ac9797b62ba4dcc8a2fb7936412b0">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY libtool-home "&gnu-software;libtool/">
+<!ENTITY libtool-ch6-du "">
+<!ENTITY libtool-ch6-sbu "">
 
 <!ENTITY linux-dl-version "2.6">
 <!ENTITY linux-version "2.6.16.16">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY linux-size "39,880 KB">
+<!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.bz2">
 <!ENTITY linux-md5 "dfb066db24a8a9b36358fb290cb06959">
-<!ENTITY -home "">
-<!ENTITY -ch8-du "">
-<!ENTITY -ch8-sbu "">
+<!ENTITY linux-home "http://www.kernel.org/">
+<!ENTITY linux-ch8-du "">
+<!ENTITY linux-ch8-sbu "">
 
 <!ENTITY linux-libc-headers-version "2.6.12.0">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY linux-libc-headers-size "2,481 KB">
+<!ENTITY linux-libc-headers-url "http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-&linux-libc-headers-version;.tar.bz2">
 <!ENTITY linux-libc-headers-md5 "eae2f562afe224ad50f65a6acfb4252c">
-<!ENTITY -home "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY linux-libc-headers-home " ">
+<!ENTITY linux-libc-headers-ch5-du "">
+<!ENTITY linux-libc-headers-ch5-sbu "">
+<!ENTITY linux-libc-headers-ch6-du "">
+<!ENTITY linux-libc-headers-ch6-sbu "">
 
 <!ENTITY m4-version "1.4.4">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY m4-size "376 KB">
+<!ENTITY m4-url "&gnu;m4/m4-&m4-version;.tar.gz">
 <!ENTITY m4-md5 "8d1d64dbecf1494690a0f3ba8db4482a">
-<!ENTITY -home "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY m4-home "&gnu-software;m4/">
+<!ENTITY m4-ch5-du "">
+<!ENTITY m4-ch5-sbu "">
+<!ENTITY m4-ch6-du "">
+<!ENTITY m4-ch6-sbu "">
 
 <!ENTITY make-version "3.80">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY make-size "900 KB">
+<!ENTITY make-url "&gnu;make/make-&make-version;.tar.bz2">
 <!ENTITY make-md5 "0bbd1df101bc0294d440471e50feca71">
-<!ENTITY -home "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY make-home "&gnu-software;make/">
+<!ENTITY make-ch5-du "">
+<!ENTITY make-ch5-sbu "">
+<!ENTITY make-ch6-du "">
+<!ENTITY make-ch6-sbu "">
 
 <!ENTITY man-db-version "2.4.3">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY man-db-size "798 KB">
+<!ENTITY man-db-url "http://savannah.nongnu.org/download/man-db/man-db-&man-db-version;.tar.gz">
 <!ENTITY man-db-md5 "30814a47f209f43b152659ba51fc7937">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY man-db-home "http://www.nongnu.org/man-db/">
+<!ENTITY man-db-ch6-du "">
+<!ENTITY man-db-ch6-sbu "">
 
 <!ENTITY man-pages-version "2.31">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY man-pages-size "1,746 KB">
+<!ENTITY man-pages-url "&kernel;linux/docs/manpages/man-pages-&man-pages-version;.tar.bz2">
 <!ENTITY man-pages-md5 "2731f0baea4f24793375358d6cd56173">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY man-pages-home " ">
+<!ENTITY man-pages-ch6-du "">
+<!ENTITY man-pages-ch6-sbu "">
 
 <!ENTITY mktemp-version "1.5">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY mktemp-size "69 KB">
+<!ENTITY mktemp-url "ftp://ftp.mktemp.org/pub/mktemp/mktemp-&mktemp-version;.tar.gz">
 <!ENTITY mktemp-md5 "9a35c59502a228c6ce2be025fc6e3ff2">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY mktemp-home "http://www.mktemp.org/">
+<!ENTITY mktemp-ch6-du "">
+<!ENTITY mktemp-ch6-sbu "">
 
 <!ENTITY module-init-tools-version "3.2.2">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY module-init-tools-size "166 KB">
+<!ENTITY module-init-tools-url "&kernel;linux/utils/kernel/module-init-tools/module-init-tools-&module-init-tools-version;.tar.bz2">
 <!ENTITY module-init-tools-md5 "a1ad0a09d3231673f70d631f3f5040e9">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY module-init-tools-home " ">
+<!ENTITY module-init-tools-ch6-du "">
+<!ENTITY module-init-tools-ch6-sbu "">
 
 <!ENTITY ncurses-version "5.5">
 <!-- <!ENTITY ncurses-date "20050319"> -->
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY ncurses-size "2,260 KB">
+<!ENTITY ncurses-url "ftp://invisible-island.net/ncurses/ncurses-&ncurses-version;.tar.gz">
 <!ENTITY ncurses-md5 "e73c1ac10b4bfc46db43b2ddfd6244ef">
-<!ENTITY -home "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY ncurses-home "http://dickey.his.com/ncurses/">
+<!ENTITY ncurses-ch5-du "">
+<!ENTITY ncurses-ch5-sbu "">
+<!ENTITY ncurses-ch6-du "">
+<!ENTITY ncurses-ch6-sbu "">
 
 <!ENTITY patch-version "2.5.4">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY patch-size "183 KB">
+<!ENTITY patch-url "&gnu;patch/patch-&patch-version;.tar.gz">
 <!ENTITY patch-md5 "ee5ae84d115f051d87fcaaef3b4ae782">
-<!ENTITY -home "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY patch-home "&gnu-software;patch/">
+<!ENTITY patch-ch5-du "">
+<!ENTITY patch-ch5-sbu "">
+<!ENTITY patch-ch6-du "">
+<!ENTITY patch-ch6-sbu "">
 
 <!ENTITY perl-version "5.8.8">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY perl-size "9,887 KB">
+<!ENTITY perl-url "http://ftp.funet.fi/pub/CPAN/src/perl-&perl-version;.tar.bz2">
 <!ENTITY perl-md5 "a377c0c67ab43fd96eeec29ce19e8382">
-<!ENTITY -home "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY perl-home "http://www.perl.com/">
+<!ENTITY perl-ch5-du "">
+<!ENTITY perl-ch5-sbu "">
+<!ENTITY perl-ch6-du "">
+<!ENTITY perl-ch6-sbu "">
 
 <!ENTITY procps-version "3.2.6">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY procps-size "273 KB">
+<!ENTITY procps-url "http://procps.sourceforge.net/procps-&procps-version;.tar.gz">
 <!ENTITY procps-md5 "7ce39ea27d7b3da0e8ad74dd41d06783">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY procps-home "http://procps.sourceforge.net/">
+<!ENTITY procps-ch6-du "">
+<!ENTITY procps-ch6-sbu "">
 
 <!ENTITY psmisc-version "22.2">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY psmisc-size "239 KB">
+<!ENTITY psmisc-url "&sourceforge;psmisc/psmisc-&psmisc-version;.tar.gz?download">
 <!ENTITY psmisc-md5 "77737c817a40ef2c160a7194b5b64337">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY psmisc-home "http://psmisc.sourceforge.net/">
+<!ENTITY psmisc-ch6-du "">
+<!ENTITY psmisc-ch6-sbu "">
 
 <!ENTITY readline-version "5.1">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY readline-size "1,983 KB">
+<!ENTITY readline-url "&gnu;readline/readline-&readline-version;.tar.gz">
 <!ENTITY readline-md5 "7ee5a692db88b30ca48927a13fd60e46">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY readline-home "http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html">
+<!ENTITY readline-ch6-du "">
+<!ENTITY readline-ch6-sbu "">
 
 <!ENTITY sed-version "4.1.5">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY sed-size "781 KB">
+<!ENTITY sed-url "&gnu;sed/sed-&sed-version;.tar.gz">
 <!ENTITY sed-md5 "7a1cbbbb3341287308e140bd4834c3ba">
-<!ENTITY -home "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY sed-home "&gnu-software;sed/">
+<!ENTITY sed-ch5-du "">
+<!ENTITY sed-ch5-sbu "">
+<!ENTITY sed-ch6-du "">
+<!ENTITY sed-ch6-sbu "">
 
 <!ENTITY shadow-version "4.0.15">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY shadow-size "1,265 KB">
+<!ENTITY shadow-url "ftp://ftp.pld.org.pl/software/shadow/shadow-&shadow-version;.tar.bz2">
 <!ENTITY shadow-md5 "a0452fa989f8ba45023cc5a08136568e">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY shadow-home " ">
+<!ENTITY shadow-ch6-du "">
+<!ENTITY shadow-ch6-sbu "">
 
 <!ENTITY sysklogd-version "1.4.1">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY sysklogd-size "80 KB">
+<!ENTITY sysklogd-url "http://www.infodrom.org/projects/sysklogd/download/sysklogd-&sysklogd-version;.tar.gz">
 <!ENTITY sysklogd-md5 "d214aa40beabf7bdb0c9b3c64432c774">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY sysklogd-home "http://www.infodrom.org/projects/sysklogd/">
+<!ENTITY sysklogd-ch6-du "">
+<!ENTITY sysklogd-ch6-sbu "">
 
 <!ENTITY sysvinit-version "2.86">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY sysvinit-size "97 KB">
+<!ENTITY sysvinit-url "ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-&sysvinit-version;.tar.gz">
 <!ENTITY sysvinit-md5 "7d5d61c026122ab791ac04c8a84db967">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY sysvinit-home " ">
+<!ENTITY sysvinit-ch6-du "">
+<!ENTITY sysvinit-ch6-sbu "">
 
 <!ENTITY tar-version "1.15.1">
-<!ENTITY -size "">
-<!ENTITY -url "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
+<!ENTITY tar-size "1,574 KB">
+<!ENTITY tar-url "&gnu;tar/tar-&tar-version;.tar.bz2">
 <!ENTITY tar-md5 "57da3c38f8e06589699548a34d5a5d07">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY tar-home "&gnu-software;tar/">
+<!ENTITY tar-ch5-du "">
+<!ENTITY tar-ch5-sbu "">
+<!ENTITY tar-ch6-du "">
+<!ENTITY tar-ch6-sbu "">
 
 <!ENTITY tcl-version "8.4.13">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY tcl-size "3,432 KB">
+<!ENTITY tcl-url "&sourceforge;tcl/tcl&tcl-version;-src.tar.gz?download">
 <!ENTITY tcl-md5 "c6b655ad5db095ee73227113220c0523">
-<!ENTITY -home "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
+<!ENTITY tcl-home "http://tcl.sourceforge.net/">
+<!ENTITY tcl-ch5-du "">
+<!ENTITY tcl-ch5-sbu "">
 
 <!ENTITY texinfo-version "4.8">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY texinfo-size "1,487 KB">
+<!ENTITY texinfo-url "&gnu;texinfo/texinfo-&texinfo-version;.tar.bz2">
 <!ENTITY texinfo-md5 "6ba369bbfe4afaa56122e65b3ee3a68c">
-<!ENTITY -home "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY texinfo-home "&gnu-software;texinfo/">
+<!ENTITY texinfo-ch5-du "">
+<!ENTITY texinfo-ch5-sbu "">
+<!ENTITY texinfo-ch6-du "">
+<!ENTITY texinfo-ch6-sbu "">
 
 <!ENTITY udev-version "091">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY udev-size "189 KB">
+<!ENTITY udev-url "&kernel;linux/utils/kernel/hotplug/udev-&udev-version;.tar.bz2">
 <!ENTITY udev-md5 "4151022ea7b4dcfaa768c1b7bf2ab9e5">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY udev-home "http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html">
+<!ENTITY udev-ch6-du "">
+<!ENTITY udev-ch6-sbu "">
 
 <!ENTITY udev-config "udev-config-20060430">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY udev-config-size "4 KB">
+<!ENTITY udev-config-url "http://downloads.linuxfromscratch.org/&udev-config;.tar.bz2">
 <!ENTITY udev-config-md5 "757a3aa05873be2ebb3f785230833656">
-<!ENTITY -home "">
+<!ENTITY udev-config-home " ">
 
 <!ENTITY util-linux-version "2.12r">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY util-linux-size "1,339 KB">
+<!ENTITY util-linux-url "&kernel;linux/utils/util-linux/util-linux-&util-linux-version;.tar.bz2">
 <!ENTITY util-linux-md5 "af9d9e03038481fbf79ea3ac33f116f9">
-<!ENTITY -home "">
-<!ENTITY -ch5-du "">
-<!ENTITY -ch5-sbu "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY util-linux-home " ">
+<!ENTITY util-linux-ch5-du "">
+<!ENTITY util-linux-ch5-sbu "">
+<!ENTITY util-linux-ch6-du "">
+<!ENTITY util-linux-ch6-sbu "">
 
 <!ENTITY vim-version "6.4">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY vim-size "3,650 KB">
+<!ENTITY vim-url "ftp://ftp.vim.org/pub/vim/unix/vim-&vim-version;.tar.bz2">
 <!ENTITY vim-md5 "774c14d93ce58674b3b2c880edd12d77">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
-
-<!ENTITY vim-lamg-version "&vim-version;">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY vim-home "http://www.vim.org">
+<!ENTITY vim-ch6-du "">
+<!ENTITY vim-ch6-sbu "">
+<!ENTITY vim-lang-version "&vim-version;">
+<!ENTITY vim-lang-size "1,093 KB">
+<!ENTITY vim-lang-url "ftp://ftp.vim.org/pub/vim/extra/vim-&vim-lang-version;-lang.tar.gz">
 <!ENTITY vim-lang-md5 "3cca6128fe5439e89d3828b5e708bddb">
-<!ENTITY -home "">
+<!ENTITY vim-lang-home " ">
 
 <!ENTITY zlib-version "1.2.3">
-<!ENTITY -size "">
-<!ENTITY -url "">
+<!ENTITY zlib-size "485 KB">
+<!ENTITY zlib-url "http://www.zlib.net/zlib-&zlib-version;.tar.gz">
 <!ENTITY zlib-md5 "debc62758716a169df9f62e6ab2bc634">
-<!ENTITY -home "">
-<!ENTITY -ch6-du "">
-<!ENTITY -ch6-sbu "">
+<!ENTITY zlib-home "http://www.zlib.net/">
+<!ENTITY zlib-ch6-du "">
+<!ENTITY zlib-ch6-sbu "">
 
diff --git a/stylesheets/xhtml/lfs-mixed.xsl b/stylesheets/xhtml/lfs-mixed.xsl
index 50e4140f1..28460256b 100644
--- a/stylesheets/xhtml/lfs-mixed.xsl
+++ b/stylesheets/xhtml/lfs-mixed.xsl
@@ -4,6 +4,31 @@
                 xmlns="http://www.w3.org/1999/xhtml"
                 version="1.0">
 
+    <!-- para -->
+  <xsl:template match="para">
+    <xsl:choose>
+      <xsl:when test="child::ulink[@url=' ']"/>
+      <xsl:otherwise>
+        <xsl:call-template name="paragraph">
+          <xsl:with-param name="class">
+            <xsl:if test="@role and $para.propagates.style != 0">
+              <xsl:value-of select="@role"/>
+            </xsl:if>
+          </xsl:with-param>
+          <xsl:with-param name="content">
+            <xsl:if test="position() = 1 and parent::listitem">
+              <xsl:call-template name="anchor">
+                <xsl:with-param name="node" select="parent::listitem"/>
+              </xsl:call-template>
+            </xsl:if>
+            <xsl:call-template name="anchor"/>
+            <xsl:apply-templates/>
+          </xsl:with-param>
+        </xsl:call-template>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
     <!-- screen -->
   <xsl:template match="screen">
     <xsl:choose>
@@ -19,7 +44,7 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-  
+
   <xsl:template match="userinput">
     <xsl:choose>
       <xsl:when test="ancestor::screen">
@@ -54,7 +79,7 @@
     </div>
   </xsl:template>
 
-  
+
   <!-- variablelist -->
   <xsl:template match="variablelist">
     <xsl:choose>
@@ -68,7 +93,7 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-  
+
 
     <!-- Body attributes -->
   <xsl:template name="body.attributes">
@@ -101,7 +126,7 @@
       </i>
     </a>
   </xsl:template>
-  
+
     <!-- The <code> xhtml tag have look issues in some browsers, like Konqueror and.
       isn't semantically correct (a filename isn't a code fragment) We will use <tt> for now. -->
   <xsl:template name="inline.monoseq">
@@ -122,7 +147,7 @@
       <xsl:copy-of select="$content"/>
     </tt>
   </xsl:template>
-  
+
   <xsl:template name="inline.boldmonoseq">
     <xsl:param name="content">
       <xsl:call-template name="anchor"/>
@@ -135,7 +160,7 @@
     <!-- don't put <strong> inside figure, example, or table titles -->
     <!-- or other titles that may already be represented with <strong>'s. -->
     <xsl:choose>
-      <xsl:when test="local-name(..) = 'title' and (local-name(../..) = 'figure' 
+      <xsl:when test="local-name(..) = 'title' and (local-name(../..) = 'figure'
               or local-name(../..) = 'example' or local-name(../..) = 'table' or local-name(../..) = 'formalpara')">
         <tt class="{local-name(.)}">
           <xsl:if test="@dir">
@@ -160,7 +185,7 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-  
+
   <xsl:template name="inline.italicmonoseq">
     <xsl:param name="content">
       <xsl:call-template name="anchor"/>
@@ -182,5 +207,58 @@
     </em>
   </xsl:template>
 
+    <!-- Total packages size calculation -->
+  <xsl:template match="returnvalue">
+    <xsl:call-template name="calculation">
+     <xsl:with-param name="scope" select="../../variablelist"/>
+    </xsl:call-template>
+  </xsl:template>
+
+  <xsl:template name="calculation">
+    <xsl:param name="scope"/>
+    <xsl:param name="total">0</xsl:param>
+    <xsl:param name="position">1</xsl:param>
+    <xsl:variable name="tokens" select="count($scope/varlistentry)"/>
+    <xsl:variable name="token" select="$scope/varlistentry[$position]/term/token"/>
+    <xsl:variable name="size" select="substring-before($token,' KB')"/>
+    <xsl:variable name="rawsize">
+      <xsl:choose>
+        <xsl:when test="contains($size,',')">
+          <xsl:value-of select="concat(substring-before($size,','),substring-after($size,','))"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="$size"/>
+        </xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+    <xsl:choose>
+      <xsl:when test="$position &lt;= $tokens">
+        <xsl:call-template name="calculation">
+          <xsl:with-param name="scope" select="$scope"/>
+          <xsl:with-param name="position" select="$position +1"/>
+          <xsl:with-param name="total" select="$total + $rawsize"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:choose>
+          <xsl:when test="$total &lt; '1000'">
+            <xsl:value-of select="$total"/>
+            <xsl:text>  KB</xsl:text>
+          </xsl:when>
+          <xsl:when test="$total &gt; '1000' and $total &lt; '5000'">
+            <xsl:value-of select="substring($total,1,1)"/>
+            <xsl:text>,</xsl:text>
+            <xsl:value-of select="substring($total,2)"/>
+            <xsl:text>  KB</xsl:text>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="round($total div 1024)"/>
+            <xsl:text>  MB</xsl:text>
+          </xsl:otherwise>
+        </xsl:choose>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
+
 
 </xsl:stylesheet>