Index: general.ent
===================================================================
--- general.ent	(revision f1acf6b619d8fe91b55bfd7f62a2df75531536eb)
+++ general.ent	(revision 3122a1283579a06c5f648f487f3375e8d58843ba)
@@ -31,4 +31,5 @@
 
 <!ENTITY gnu "http://ftp.gnu.org/gnu/">
+<!ENTITY gnu-software "http://www.gnu.org/software/">
 <!ENTITY alpha-gnu "ftp://alpha.gnu.org/gnu/">
 <!ENTITY redhat "ftp://sources.redhat.com/pub/">
Index: materials/alpha/packages.xml
===================================================================
--- materials/alpha/packages.xml	(revision f1acf6b619d8fe91b55bfd7f62a2df75531536eb)
+++ materials/alpha/packages.xml	(revision 3122a1283579a06c5f648f487f3375e8d58843ba)
@@ -16,5 +16,7 @@
       <term>Aboot (&aboot-version;) - &aboot-size;:</term>
       <listitem>
-        <para><ulink url="&aboot-url;"/></para>
+        <para>Home page: <ulink url="&aboot-home;"/></para>
+        <para>Download: <ulink url="&aboot-url;"/></para>
+        <para>MD5 sum: <literal>&aboot-md5;</literal></para>
       </listitem>
     </varlistentry>
Index: materials/common/packages.xml
===================================================================
--- materials/common/packages.xml	(revision f1acf6b619d8fe91b55bfd7f62a2df75531536eb)
+++ materials/common/packages.xml	(revision 3122a1283579a06c5f648f487f3375e8d58843ba)
@@ -18,5 +18,7 @@
       <term>Autoconf (&autoconf-version;) - &autoconf-size;:</term>
       <listitem>
-        <para><ulink url="&autoconf-url;"/></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>
@@ -25,5 +27,7 @@
       <term>Automake (&automake-version;) - &automake-size;:</term>
       <listitem>
-        <para><ulink url="&automake-url;"/></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>
@@ -32,5 +36,7 @@
       <term>Bash (&bash-version;) - &bash-size;:</term>
       <listitem>
-        <para><ulink url="&bash-url;"/></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>
@@ -39,5 +45,7 @@
       <term>Bash Documentation (&bash-doc-version;) - &bash-doc-size;:</term>
       <listitem>
-        <para><ulink url="&bash-doc-url;"/></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>
@@ -46,5 +54,7 @@
       <term>Binutils (&binutils-version;) - &binutils-size;:</term>
       <listitem>
-        <para><ulink url="&binutils-url;"/></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>
@@ -53,5 +63,7 @@
       <term>Bison (&bison-version;) - &bison-size;:</term>
       <listitem>
-        <para><ulink url="&bison-url;"/></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>
@@ -60,5 +72,7 @@
       <term>Bzip2 (&bzip2-version;) - &bzip2-size;:</term>
       <listitem>
-        <para><ulink url="&bzip2-url;"/></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>
@@ -67,5 +81,7 @@
       <term>CLFS-Bootscripts (&clfs-bootscripts-version;) - &clfs-bootscripts-size;:</term>
       <listitem>
-        <para><ulink url="&clfs-bootscripts-url;"/></para>
+        <para>Home page: <ulink url="&clfs-bootscripts-home;"/></para>
+        <para>Download: <ulink url="&clfs-bootscripts-url;"/></para>
+        <para>MD5 sum: <literal>&clfs-bootscripts-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -74,5 +90,7 @@
       <term>Coreutils (&coreutils-version;) - &coreutils-size;:</term>
       <listitem>
-        <para><ulink url="&coreutils-url;"/></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>
@@ -81,5 +99,7 @@
       <term>DejaGNU (&dejagnu-version;) - &dejagnu-size;:</term>
       <listitem>
-        <para><ulink url="&dejagnu-url;"/></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>
@@ -88,5 +108,7 @@
       <term>Diffutils (&diffutils-version;) - &diffutils-size;:</term>
       <listitem>
-        <para><ulink url="&diffutils-url;"/></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>
@@ -95,5 +117,7 @@
       <term>E2fsprogs (&e2fsprogs-version;) - &e2fsprogs-size;:</term>
       <listitem>
-        <para><ulink url="&e2fsprogs-url;"/></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>
@@ -102,5 +126,7 @@
       <term>Expect (&expect-version;) - &expect-size;:</term>
       <listitem>
-        <para><ulink url="&expect-url;"/></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>
@@ -109,5 +135,7 @@
       <term>File (&file-version;) - &file-size;:</term>
       <listitem>
-        <para><ulink url="&file-url;"/></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>
@@ -125,5 +153,7 @@
       <term>Findutils (&findutils-version;) - &findutils-size;:</term>
       <listitem>
-        <para><ulink url="&findutils-url;"/></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>
@@ -132,5 +162,7 @@
       <term>Flex (&flex-version;) - &flex-size;:</term>
       <listitem>
-        <para><ulink url="&flex-url;"/></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>
@@ -139,5 +171,7 @@
       <term>Gawk (&gawk-version;) - &gawk-size;:</term>
       <listitem>
-        <para><ulink url="&gawk-url;"/></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>
@@ -146,5 +180,7 @@
       <term>GCC (&gcc-version;) - &gcc-size;:</term>
       <listitem>
-        <para><ulink url="&gcc-url;"/></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>
@@ -153,5 +189,7 @@
       <term>Gettext (&gettext-version;) - &gettext-size;:</term>
       <listitem>
-        <para><ulink url="&gettext-url;"/></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>
@@ -160,5 +198,7 @@
       <term>Glibc (&glibc-version;) - &glibc-size;:</term>
       <listitem>
-        <para><ulink url="&glibc-url;"/></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>
@@ -167,5 +207,7 @@
       <term>Grep (&grep-version;) - &grep-size;:</term>
       <listitem>
-        <para><ulink url="&grep-url;"/></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>
@@ -174,5 +216,7 @@
       <term>Groff (&groff-version;) - &groff-size;:</term>
       <listitem>
-        <para><ulink url="&groff-url;"/></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>
@@ -181,5 +225,7 @@
       <term>Gzip (&gzip-version;) - &gzip-size;:</term>
       <listitem>
-        <para><ulink url="&gzip-url;"/></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>
@@ -188,5 +234,7 @@
       <term>Iana-Etc (&iana-etc-version;) - &iana-etc-size;:</term>
       <listitem>
-        <para><ulink url="&iana-etc-url;"/></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>
@@ -195,5 +243,7 @@
       <term>Inetutils (&inetutils-version;) - &inetutils-size;:</term>
       <listitem>
-        <para><ulink url="&inetutils-url;"/></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>
@@ -202,5 +252,7 @@
       <term>IPRoute2 (&iproute2-version;) - &iproute2-size;:</term>
       <listitem>
-        <para><ulink url="&iproute2-url;"/></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>
@@ -209,5 +261,7 @@
       <term>Kbd (&kbd-version;) - &kbd-size;:</term>
       <listitem>
-        <para><ulink url="&kbd-url;"/></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>
@@ -216,5 +270,7 @@
       <term>Less (&less-version;) - &less-size;:</term>
       <listitem>
-        <para><ulink url="&less-url;"/></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>
@@ -223,5 +279,7 @@
       <term>Libtool (&libtool-version;) - &libtool-size;:</term>
       <listitem>
-        <para><ulink url="&libtool-url;"/></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>
@@ -230,5 +288,7 @@
       <term>Linux (&linux-version;) - &linux-size;:</term>
       <listitem>
-        <para><ulink url="&linux-url;"/></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>
@@ -237,5 +297,7 @@
       <term>Linux-Headers (&linux-headers-version;) - &linux-headers-size;:</term>
       <listitem>
-        <para><ulink url="&linux-headers-url;"/></para>
+        <para>Home page: <ulink url="&linux-headers-home;"/></para>
+        <para>Download: <ulink url="&linux-headers-url;"/></para>
+        <para>MD5 sum: <literal>&linux-headers-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -244,5 +306,7 @@
       <term>M4 (&m4-version;) - &m4-size;:</term>
       <listitem>
-        <para><ulink url="&m4-url;"/></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>
@@ -251,5 +315,7 @@
       <term>Make (&make-version;) - &make-size;:</term>
       <listitem>
-        <para><ulink url="&make-url;"/></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>
@@ -258,5 +324,7 @@
       <term>Man (&man-version;) - &man-size;:</term>
       <listitem>
-        <para><ulink url="&man-url;"/></para>
+        <para>Home page: <ulink url="&man-home;"/></para>
+        <para>Download: <ulink url="&man-url;"/></para>
+        <para>MD5 sum: <literal>&man-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -265,5 +333,7 @@
       <term>Man-pages (&man-pages-version;) - &man-pages-size;:</term>
       <listitem>
-        <para><ulink url="&man-pages-url;"/></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>
@@ -272,5 +342,7 @@
       <term>Mktemp (&mktemp-version;) - &mktemp-size;:</term>
       <listitem>
-        <para><ulink url="&mktemp-url;"/></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>
@@ -279,5 +351,7 @@
       <term>Module-Init-Tools (&module-init-tools-version;) - &module-init-tools-size;:</term>
       <listitem>
-        <para><ulink url="&module-init-tools-url;"/></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>
@@ -286,5 +360,7 @@
       <term>Ncurses (&ncurses-version;) - &ncurses-size;:</term>
       <listitem>
-        <para><ulink url="&ncurses-url;"/></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>
@@ -293,5 +369,7 @@
       <term>Patch (&patch-version;) - &patch-size;:</term>
       <listitem>
-        <para><ulink url="&patch-url;"/></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>
@@ -300,5 +378,7 @@
       <term>Perl (&perl-version;) - &perl-size;:</term>
       <listitem>
-        <para><ulink url="&perl-url;"/></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>
@@ -307,5 +387,7 @@
       <term>Procps (&procps-version;) - &procps-size;:</term>
       <listitem>
-        <para><ulink url="&procps-url;"/></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>
@@ -314,5 +396,7 @@
       <term>Psmisc (&psmisc-version;) - &psmisc-size;:</term>
       <listitem>
-        <para><ulink url="&psmisc-url;"/></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>
@@ -321,6 +405,7 @@
       <term>Readline (&readline-version;) - &readline-size;:</term>
       <listitem>
-        <para><ulink
-        url="&readline-url;"/></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>
@@ -329,5 +414,7 @@
       <term>Sed (&sed-version;) - &sed-size;:</term>
       <listitem>
-        <para><ulink url="&sed-url;"/></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>
@@ -336,5 +423,7 @@
       <term>Shadow (&shadow-version;) - &shadow-size;:</term>
       <listitem>
-        <para><ulink url="&shadow-url;"/></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>
@@ -352,5 +441,7 @@
       <term>Sysklogd (&sysklogd-version;) - &sysklogd-size;:</term>
       <listitem>
-        <para><ulink url="&sysklogd-url;"/></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>
@@ -359,5 +450,7 @@
       <term>Sysvinit (&sysvinit-version;) - &sysvinit-size;:</term>
       <listitem>
-        <para><ulink url="&sysvinit-url;"/></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>
@@ -366,5 +459,7 @@
       <term>Tar (&tar-version;) - &tar-size;:</term>
       <listitem>
-        <para><ulink url="&tar-url;"/></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>
@@ -373,5 +468,7 @@
       <term>Tcl (&tcl-version;) - &tcl-size;:</term>
       <listitem>
-        <para><ulink url="&tcl-url;"/></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>
@@ -380,5 +477,7 @@
       <term>Texinfo (&texinfo-version;) - &texinfo-size;:</term>
       <listitem>
-        <para><ulink url="&texinfo-url;"/></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>
@@ -387,5 +486,7 @@
       <term>Tree (&tree-version;) - &tree-size;:</term>
       <listitem>
-        <para><ulink url="&tree-url;"/></para>
+        <para>Home page: <ulink url="&tree-home;"/></para>
+        <para>Download: <ulink url="&tree-url;"/></para>
+        <para>MD5 sum: <literal>&tree-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -394,5 +495,7 @@
       <term>Udev (&udev-version;) - &udev-size;:</term>
       <listitem>
-        <para><ulink url="&udev-url;"/></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>
@@ -401,5 +504,7 @@
       <term>Udev Cross-LFS Rules (&udev-cross-lfs-version;) - &udev-cross-lfs-size;:</term>
       <listitem>
-        <para><ulink url="&udev-cross-lfs-url;"/></para>
+        <para>Home page: <ulink url="&udev-cross-lfs-home;"/></para>
+        <para>Download: <ulink url="&udev-cross-lfs-url;"/></para>
+        <para>MD5 sum: <literal>&udev-cross-lfs-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -408,5 +513,7 @@
       <term>Util-linux (&util-linux-version;) - &util-linux-size;:</term>
       <listitem>
-        <para><ulink url="&util-linux-url;"/></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>
@@ -415,5 +522,7 @@
       <term>Vim (&vim-version;) - &vim-size;:</term>
       <listitem>
-        <para><ulink url="&vim-url;"/></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>
@@ -422,5 +531,7 @@
       <term>Vim (&vim-version;) language files (optional) - &vim-language-size;:</term>
       <listitem>
-        <para><ulink url="&vim-language-url;"/></para>
+        <para>Home page: <ulink url="&vim-language-home;"/></para>
+        <para>Download: <ulink url="&vim-language-url;"/></para>
+        <para>MD5 sum: <literal>&vim-language-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -429,5 +540,7 @@
       <term>Zlib (&zlib-version;) - &zlib-size;:</term>
       <listitem>
-        <para><ulink url="&zlib-url;"/></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>
Index: materials/mips/packages.xml
===================================================================
--- materials/mips/packages.xml	(revision f1acf6b619d8fe91b55bfd7f62a2df75531536eb)
+++ materials/mips/packages.xml	(revision 3122a1283579a06c5f648f487f3375e8d58843ba)
@@ -16,5 +16,7 @@
       <term>ARCLoad (&arcload-version;) - &arcload-size;:</term>
       <listitem>
-        <para><ulink url="&arcload-url;"/></para>
+        <para>Home page: <ulink url="&arcload-home;"/></para>
+        <para>Download: <ulink url="&arcload-url;"/></para>
+        <para>MD5 sum: <literal>&arcload-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -23,5 +25,7 @@
       <term>Colo (&colo-version;) - &colo-size;:</term>
       <listitem>
-        <para><ulink url="&colo-url;"/></para>
+        <para>Home page: <ulink url="&colo-home;"/></para>
+        <para>Download: <ulink url="&colo-url;"/></para>
+        <para>MD5 sum: <literal>&colo-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -30,5 +34,7 @@
       <term>DVHtool (&dvhtool-version;) - &dvhtool-size;:</term>
       <listitem>
-        <para><ulink url="&dvhtool-url;"/></para>
+        <para>Home page: <ulink url="&dvhtool-home;"/></para>
+        <para>Download: <ulink url="&dvhtool-url;"/></para>
+        <para>MD5 sum: <literal>&dvhtool-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -37,5 +43,7 @@
       <term>Glibc Ports (&glibc-ports-version;) - &glibc-ports-size;:</term>
       <listitem>
-        <para><ulink url="&glibc-ports-url;"/></para>
+        <para>Home page: <ulink url="&glibc-ports-home;"/></para>
+        <para>Download: <ulink url="&glibc-ports-url;"/></para>
+        <para>MD5 sum: <literal>&glibc-ports-md5;</literal></para>
       </listitem>
     </varlistentry>
Index: materials/ppc/packages.xml
===================================================================
--- materials/ppc/packages.xml	(revision f1acf6b619d8fe91b55bfd7f62a2df75531536eb)
+++ materials/ppc/packages.xml	(revision 3122a1283579a06c5f648f487f3375e8d58843ba)
@@ -16,5 +16,7 @@
       <term>Hfsutils (&hfsutils-version;) - &hfsutils-size;:</term>
       <listitem>
-        <para><ulink url="&hfsutils-url;"/></para>
+        <para>Home page: <ulink url="&hfsutils-home;"/></para>
+        <para>Download: <ulink url="&hfsutils-url;"/></para>
+        <para>MD5 sum: <literal>&hfsutils-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -23,5 +25,7 @@
       <term>Parted (&parted-version;) - &parted-size;:</term>
       <listitem>
-        <para><ulink url="&parted-url;"/></para>
+        <para>Home page: <ulink url="&parted-home;"/></para>
+        <para>Download: <ulink url="&parted-url;"/></para>
+        <para>MD5 sum: <literal>&parted-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -30,5 +34,7 @@
       <term>Powerpc-utils (&powerpcutils-version;) - &powerpcutils-size;:</term>
       <listitem>
-        <para><ulink url="&powerpcutils-url;"/></para>
+        <para>Home page: <ulink url="&powerpcutils-home;"/></para>
+        <para>Download: <ulink url="&powerpcutils-url;"/></para>
+        <para>MD5 sum: <literal>&powerpcutils-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -37,5 +43,7 @@
       <term>Yaboot (&yaboot-version;) - &yaboot-size;:</term>
       <listitem>
-        <para><ulink url="&yaboot-url;"/></para>
+        <para>Home page: <ulink url="&yaboot-home;"/></para>
+        <para>Download: <ulink url="&yaboot-url;"/></para>
+        <para>MD5 sum: <literal>&yaboot-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -43,5 +51,5 @@
   </variablelist>
 
-  <para>Total size of these packages: about 2.1 MB</para>
+  <para os="a">Total size of these packages: about 2.1 MB</para>
 
 </sect1>
Index: materials/ppc64/packages.xml
===================================================================
--- materials/ppc64/packages.xml	(revision f1acf6b619d8fe91b55bfd7f62a2df75531536eb)
+++ materials/ppc64/packages.xml	(revision 3122a1283579a06c5f648f487f3375e8d58843ba)
@@ -11,37 +11,11 @@
   <title>Additional Packages for PowerPC64</title>
 
-  <variablelist role="materials">
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../ppc/packages.xml"
+  xpointer="xpointer(//*[@role='materials'])"/>
 
-    <varlistentry>
-      <term>Hfsutils (&hfsutils-version;) - &hfsutils-size;:</term>
-      <listitem>
-        <para><ulink url="&hfsutils-url;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Parted (&parted-version;) - &parted-size;:</term>
-      <listitem>
-        <para><ulink url="&parted-url;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Powerpc-utils (&powerpcutils-version;) - &powerpcutils-size;:</term>
-      <listitem>
-        <para><ulink url="&powerpcutils-url;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Yaboot (&yaboot-version;) - &yaboot-size;:</term>
-      <listitem>
-        <para><ulink url="&yaboot-url;"/></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <para>Total size of these packages: about 2.1 MB</para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../ppc/packages.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
 </sect1>
Index: materials/sparc/packages.xml
===================================================================
--- materials/sparc/packages.xml	(revision f1acf6b619d8fe91b55bfd7f62a2df75531536eb)
+++ materials/sparc/packages.xml	(revision 3122a1283579a06c5f648f487f3375e8d58843ba)
@@ -16,5 +16,7 @@
       <term>ELFtoaout (&elftoaout-version;) - &elftoaout-size;:</term>
       <listitem>
-        <para><ulink url="&elftoaout-url;"/></para>
+        <para>Home page: <ulink url="&elftoaout-home;"/></para>
+        <para>Download: <ulink url="&elftoaout-url;"/></para>
+        <para>MD5 sum: <literal>&elftoaout-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -23,5 +25,7 @@
       <term>Silo (&silo-version;) - &silo-size;:</term>
       <listitem>
-        <para><ulink url="&silo-url;"/></para>
+        <para>Home page: <ulink url="&silo-home;"/></para>
+        <para>Download: <ulink url="&silo-url;"/></para>
+        <para>MD5 sum: <literal>&silo-md5;</literal></para>
       </listitem>
     </varlistentry>
Index: materials/x86/packages.xml
===================================================================
--- materials/x86/packages.xml	(revision f1acf6b619d8fe91b55bfd7f62a2df75531536eb)
+++ materials/x86/packages.xml	(revision 3122a1283579a06c5f648f487f3375e8d58843ba)
@@ -16,5 +16,7 @@
       <term>GRUB (&grub-version;) - &grub-size;:</term>
       <listitem>
-        <para><ulink url="&grub-url;"/></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>
Index: materials/x86_64-64/packages.xml
===================================================================
--- materials/x86_64-64/packages.xml	(revision f1acf6b619d8fe91b55bfd7f62a2df75531536eb)
+++ materials/x86_64-64/packages.xml	(revision 3122a1283579a06c5f648f487f3375e8d58843ba)
@@ -16,5 +16,7 @@
       <term>Bin86 (&bin86-version;) - &bin86-size;:</term>
       <listitem>
-        <para><ulink url="&bin86-url;"/></para>
+        <para>Home page: <ulink url="&bin86-home;"/></para>
+        <para>Download: <ulink url="&bin86-url;"/></para>
+        <para>MD5 sum: <literal>&bin86-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -23,5 +25,7 @@
       <term>Lilo (&lilo-version;) - &lilo-size;:</term>
       <listitem>
-        <para><ulink url="&lilo-url;"/></para>
+        <para>Home page: <ulink url="&lilo-home;"/></para>
+        <para>Download: <ulink url="&lilo-url;"/></para>
+        <para>MD5 sum: <literal>&lilo-md5;</literal></para>
       </listitem>
     </varlistentry>
Index: packages.ent
===================================================================
--- packages.ent	(revision f1acf6b619d8fe91b55bfd7f62a2df75531536eb)
+++ packages.ent	(revision 3122a1283579a06c5f648f487f3375e8d58843ba)
@@ -1,19 +1,29 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!-- Note: For empty *-home entities use " " not "" -->
 
 <!ENTITY aboot-version "0.9b">
 <!ENTITY aboot-size "112 KB">
 <!ENTITY aboot-url "&sourceforge;aboot/aboot-&aboot-version;.tar.bz2?download">
+<!ENTITY aboot-md5 "5f16edbf4e9d52cd191adc4d4b6a5327">
+<!ENTITY aboot-home "http://sourceforge.net/projects/aboot">
 
 <!ENTITY arcload-version "0.5">
 <!ENTITY arcload-size "47 KB">
 <!ENTITY arcload-url "ftp://ftp.linux-mips.org/pub/linux/mips/people/skylark/arcload-&arcload-version;.tar.bz2">
+<!ENTITY arcload-md5 "b00e1c79074a13c2de97748f56f9bd1f">
+<!ENTITY arcload-home "http://www.linux-mips.org/wiki/ARCLoad">
 
 <!ENTITY autoconf-version "2.59">
 <!ENTITY autoconf-size "904 KB">
 <!ENTITY autoconf-url "&gnu;autoconf/autoconf-&autoconf-version;.tar.bz2">
+<!ENTITY autoconf-md5 "1ee40f7a676b3cfdc0e3f7cd81551b5f">
+<!ENTITY autoconf-home "&gnu-software;autoconf/">
 
 <!ENTITY automake-version "1.9.6">
 <!ENTITY automake-size "748 KB">
 <!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.bz2">
+<!ENTITY automake-md5 "c11b8100bb311492d8220378fd8bf9e0">
+<!ENTITY automake-home "&gnu-software;automake/">
 <!ENTITY automake-directory "automake-1.9">
 
@@ -21,63 +31,93 @@
 <!ENTITY bash-size "2.4 MB">
 <!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz">
+<!ENTITY bash-md5 "ef5304c4b22aaa5088972c792ed45d72">
+<!ENTITY bash-home "&gnu-software;bash/">
 
 <!ENTITY bash-doc-version "3.1">
 <!ENTITY bash-doc-size "1.0 MB">
 <!ENTITY bash-doc-url "&gnu;bash/bash-doc-&bash-doc-version;.tar.gz">
+<!ENTITY bash-doc-md5 "a8c517c6a7b21b8b855190399c5935ae">
+<!ENTITY bash-doc-home " ">
 
 <!ENTITY bin86-version "0.16.17">
 <!ENTITY bin86-size "149 KB">
 <!ENTITY bin86-url "http://homepage.ntlworld.com/robert.debath/dev86/bin86-&bin86-version;.tar.gz">
+<!ENTITY bin86-md5 "c9e8d72dd2e7457b52d0e3164fc199a1">
+<!ENTITY bin86-home "http://freshmeat.net/projects/bin86/">
 
 <!ENTITY binutils-version "2.16.92">
 <!ENTITY binutils-size "14 MB">
-<!--- 
+<!---
 <!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
 -->
 <!ENTITY binutils-url "ftp://sourceware.org/pub/binutils/snapshots/binutils-&binutils-version;.tar.bz2">
+<!ENTITY binutils-md5 "1cc2db046dbe33ee9ab97d4bf9a0631f">
+<!ENTITY binutils-home "http://sources.redhat.com/binutils/">
 
 <!ENTITY bison-version "2.1">
 <!ENTITY bison-size "1.3 MB">
 <!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.gz">
+<!ENTITY bison-md5 "b1468d49c1357aebcd1de6ef12cbf3e8">
+<!ENTITY bison-home "&gnu-software;bison/">
 
 <!ENTITY bzip2-version "1.0.3">
 <!ENTITY bzip2-size "654 KB">
 <!ENTITY bzip2-url "http://www.bzip.org/&bzip2-version;/bzip2-&bzip2-version;.tar.gz">
+<!ENTITY bzip2-md5 "8a716bebecb6e647d2e8a29ea5d8447f">
+<!ENTITY bzip2-home "http://www.bzip.org/">
 
 <!ENTITY clfs-bootscripts-version "0.1">
 <!ENTITY clfs-bootscripts-size "24 KB">
 <!ENTITY clfs-bootscripts-url "http://ftp.jg555.com/bootscripts/bootscripts-cross-lfs-&clfs-bootscripts-version;.tar.bz2">
+<!ENTITY clfs-bootscripts-md5 "cf9e749b476a9eed6a644506fff50804">
+<!ENTITY clfs-bootscripts-home " ">
 
 <!ENTITY colo-version "1.21">
 <!ENTITY colo-size "250 KB">
 <!ENTITY colo-url "http://www.colonel-panic.org/cobalt-mips/colo/colo-&colo-version;.tar.gz">
+<!ENTITY colo-md5 "9d8a37ad4984ec6660ff159e83f15404">
+<!ENTITY colo-home "http://www.linux-mips.org/wiki/CoLo">
 
 <!ENTITY coreutils-version "5.94">
 <!ENTITY coreutils-size "4.8 MB">
 <!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.bz2">
+<!ENTITY coreutils-md5 "11985c8345371546da8ff13f7efae359">
+<!ENTITY coreutils-home "&gnu-software;coreutils/">
 
 <!ENTITY dejagnu-version "1.4.4">
 <!ENTITY dejagnu-size "1 MB">
 <!ENTITY dejagnu-url "&gnu;dejagnu/dejagnu-&dejagnu-version;.tar.gz">
+<!ENTITY dejagnu-md5 "053f18fd5d00873de365413cab17a666">
+<!ENTITY dejagnu-home "&gnu-software;dejagnu/">
 
 <!ENTITY diffutils-version "2.8.7">
 <!ENTITY diffutils-size "1.1 MB">
 <!ENTITY diffutils-url "&alpha-gnu;diffutils/diffutils-&diffutils-version;.tar.gz">
+<!ENTITY diffutils-md5 "18d6587cb915e7aa110a5d463d6ed156">
+<!ENTITY diffutils-home "&gnu-software;diffutils/">
 
 <!ENTITY dvhtool-version "1.0.1">
 <!ENTITY dvhtool-size "52 KB">
 <!ENTITY dvhtool-url "http://ftp.debian.org/debian/pool/main/d/dvhtool/dvhtool_&dvhtool-version;.orig.tar.gz">
+<!ENTITY dvhtool-md5 "4448c01e6a015685af90a79fbea8da4e">
+<!ENTITY dvhtool-home "http://packages.qa.debian.org/d/dvhtool.html">
 
 <!ENTITY e2fsprogs-version "1.38">
 <!ENTITY e2fsprogs-size "3.5 MB">
 <!ENTITY e2fsprogs-url "&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz?download">
+<!ENTITY e2fsprogs-md5 "d774d4412bfb80d12cf3a4fdfd59de5a">
+<!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
 
 <!ENTITY elftoaout-version "2.3">
 <!ENTITY elftoaout-size "13 KB">
 <!ENTITY elftoaout-url "http://gd.tuwien.ac.at/opsys/linux/Owl/pool/sources/elftoaout/elftoaout-&elftoaout-version;.tgz">
+<!ENTITY elftoaout-md5 "be3bd6f7ba8ae107cbdbaa820ba64f86">
+<!ENTITY elftoaout-home " ">
 
 <!ENTITY expect-version "5.43.0">
 <!ENTITY expect-size "416 KB">
 <!ENTITY expect-url "http://expect.nist.gov/src/expect-&expect-version;.tar.gz">
+<!ENTITY expect-md5 "43e1dc0e0bc9492cf2e1a6f59f276bc3">
+<!ENTITY expect-home "http://expect.nist.gov">
 <!ENTITY expect-lib-version "5.43">
 
@@ -85,28 +125,42 @@
 <!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 file-home " ">
 
 <!ENTITY findutils-version "4.2.27">
 <!ENTITY findutils-size "1.1 MB">
 <!ENTITY findutils-url "&gnu;findutils/findutils-&findutils-version;.tar.gz">
+<!ENTITY findutils-md5 "f1e0ddf09f28f8102ff3b90f3b5bc920">
+<!ENTITY findutils-home "&gnu-software;findutils/">
 
 <!ENTITY flex-version "2.5.33">
 <!ENTITY flex-size "680 KB">
 <!ENTITY flex-url "&sourceforge;flex/flex-&flex-version;.tar.bz2?download">
+<!ENTITY flex-md5 "343374a00b38d9e39d1158b71af37150">
+<!ENTITY flex-home "http://flex.sourceforge.net">
 
 <!ENTITY gawk-version "3.1.5">
 <!ENTITY gawk-size "1.7 MB">
 <!ENTITY gawk-url "&gnu;gawk/gawk-&gawk-version;.tar.bz2">
+<!ENTITY gawk-md5 "5703f72d0eea1d463f735aad8222655f">
+<!ENTITY gawk-home "&gnu-software;gawk/">
 
 <!ENTITY gcc-version "4.1.0">
 <!ENTITY gcc-size "37 MB">
 <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
+<!ENTITY gcc-md5 "88785071f29ed0e0b6b61057a1079442">
+<!ENTITY gcc-home "http://gcc.gnu.org/">
 
 <!ENTITY gettext-version "0.14.5">
 <!ENTITY gettext-size "6.8 MB">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.gz">
+<!ENTITY gettext-md5 "e2f6581626a22a0de66dce1d81d00de3">
+<!ENTITY gettext-home "&gnu-software;gettext/">
 
 <!ENTITY glibc-version "2.4">
 <!ENTITY glibc-size "14.5 MB">
 <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.bz2">
+<!ENTITY glibc-md5 "7e9a88dcd41fbc53801dbe5bdacaf245">
+<!ENTITY glibc-home "&gnu-software;libc/">
 <!ENTITY glibc-ld-name "ld-2.4.so">
 
@@ -114,52 +168,78 @@
 <!ENTITY glibc-ports-size "534 KB">
 <!ENTITY glibc-ports-url "&gnu;glibc/glibc-ports-&glibc-ports-version;.tar.bz2">
+<!ENTITY glibc-ports-md5 "7bb1b35654e94994925e66676acabd4e">
+<!ENTITY glibc-ports-home " ">
 
 <!ENTITY grep-version "2.5.1a">
 <!ENTITY grep-size "516 KB">
 <!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.bz2">
+<!ENTITY grep-md5 "52202fe462770fa6be1bb667bd6cf30c">
+<!ENTITY grep-home "&gnu-software;grep/">
 
 <!ENTITY groff-version "1.19.2">
 <!ENTITY groff-size "2.8 MB">
 <!ENTITY groff-url "&gnu;groff/groff-&groff-version;.tar.gz">
+<!ENTITY groff-md5 "f7c9cf2e4b9967d3af167d7c9fadaae4">
+<!ENTITY groff-home "&gnu-software;groff/">
 
 <!ENTITY grub-version "0.97">
 <!ENTITY grub-size "950 KB">
 <!ENTITY grub-url "&alpha-gnu;grub/grub-&grub-version;.tar.gz">
+<!ENTITY grub-md5 "cd3f3eb54446be6003156158d51f4884">
+<!ENTITY grub-home "&gnu-software;grub/">
 
 <!ENTITY gzip-version "1.3.5">
 <!ENTITY gzip-size "324 KB">
 <!ENTITY gzip-url "&alpha-gnu;gzip/gzip-&gzip-version;.tar.gz">
+<!ENTITY gzip-md5 "3d6c191dfd2bf307014b421c12dc8469">
+<!ENTITY gzip-home "http://www.gzip.org/">
 
 <!ENTITY hfsutils-version "3.2.6">
 <!ENTITY hfsutils-size "203 KB">
 <!ENTITY hfsutils-url "ftp://ftp.mars.org/pub/hfs/hfsutils-&hfsutils-version;.tar.gz">
+<!ENTITY hfsutils-md5 "fa572afd6da969e25c1455f728750ec4">
+<!ENTITY hfsutils-home "http://www.mars.org/home/rob/proj/hfs/">
 
 <!ENTITY iana-etc-version "2.10">
 <!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 iana-etc-home "http://www.sethwklein.net/projects/iana-etc/">
 
 <!ENTITY inetutils-version "1.4.2">
 <!ENTITY inetutils-size "1019 KB">
 <!ENTITY inetutils-url "&gnu;inetutils/inetutils-&inetutils-version;.tar.gz">
+<!ENTITY inetutils-md5 "df0909a586ddac2b7a0d62795eea4206">
+<!ENTITY inetutils-home "&gnu-software;inetutils/">
 
 <!ENTITY iproute2-version "2.6.16-060323">
 <!ENTITY iproute2-size "377 KB">
 <!ENTITY iproute2-url "http://developer.osdl.org/dev/iproute2/download/iproute2-&iproute2-version;.tar.gz">
+<!ENTITY iproute2-md5 "f31d4516b35bbfeaa72c762f5959e97c">
+<!ENTITY iproute2-home "http://linux-net.osdl.org/index.php/Iproute2">
 
 <!ENTITY kbd-version "1.12">
 <!ENTITY kbd-size "618 KB">
 <!ENTITY kbd-url "&kernel;linux/utils/kbd/kbd-&kbd-version;.tar.bz2">
+<!ENTITY kbd-md5 "069d1175b4891343b107a8ac2b4a39f6">
+<!ENTITY kbd-home " ">
 
 <!ENTITY less-version "394">
 <!ENTITY less-size "286 KB">
 <!ENTITY less-url "http://www.greenwoodsoftware.com/less/less-&less-version;.tar.gz">
+<!ENTITY less-md5 "a9f072ccefa0d315b325f3e9cdbd4b97">
+<!ENTITY less-home "http://www.greenwoodsoftware.com/less/">
 
 <!ENTITY libtool-version "1.5.22">
 <!ENTITY libtool-size "2.8 MB">
 <!ENTITY libtool-url "&gnu;libtool/libtool-&libtool-version;.tar.gz">
+<!ENTITY libtool-md5 "8e0ac9797b62ba4dcc8a2fb7936412b0">
+<!ENTITY libtool-home "&gnu-software;libtool/">
 
 <!ENTITY lilo-version "22.7.1">
 <!ENTITY lilo-size "420 KB">
 <!ENTITY lilo-url "ftp://ftp.metalab.unc.edu/pub/Linux/system/boot/lilo/lilo-&lilo-version;.src.tar.gz">
+<!ENTITY lilo-md5 "1f3855c6f2c7b2beaa8a90bf9975a289">
+<!ENTITY lilo-home " ">
 
 <!ENTITY linux-dl-version "2.6">
@@ -168,116 +248,174 @@
 <!ENTITY linux-size "40 MB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.bz2">
+<!ENTITY linux-md5 "dfb066db24a8a9b36358fb290cb06959">
+<!ENTITY linux-home "http://www.kernel.org/">
 
 <!ENTITY linux-headers-version "&linux-version;-05112006">
 <!ENTITY linux-headers-size "1.5 MB">
 <!ENTITY linux-headers-url "http://ftp.jg555.com/headers/linux-headers-&linux-headers-version;.tar.bz2">
+<!ENTITY linux-headers-md5 "547d0bc7a97f019f15f447dbcd616507">
+<!ENTITY linux-headers-home "http://headers.cross-lfs.org/">
 
 <!ENTITY m4-version "1.4.4">
 <!ENTITY m4-size "300 KB">
 <!ENTITY m4-url "&gnu;m4/m4-&m4-version;.tar.bz2">
+<!ENTITY m4-md5 "eb93bfbcb12cf00165583302bb31a822">
+<!ENTITY m4-home "&gnu-software;m4/">
 
 <!ENTITY make-version "3.81">
 <!ENTITY make-size "1.1 MB">
 <!ENTITY make-url "&gnu;make/make-&make-version;.tar.bz2">
+<!ENTITY make-md5 "354853e0b2da90c527e35aabb8d6f1e6">
+<!ENTITY make-home "&gnu-software;make/">
 
 <!ENTITY man-version "1.6c">
 <!ENTITY man-size "240 KB">
 <!ENTITY man-url "http://primates.ximian.com/~flucifredi/man/man-&man-version;.tar.gz">
+<!ENTITY man-md5 "ac1e7d60dfedb7d1c6f398ae5b038996">
+<!ENTITY man-home "http://primates.ximian.com/~flucifredi/man/">
 
 <!ENTITY man-pages-version "2.31">
 <!ENTITY man-pages-size "1.7 MB">
 <!ENTITY man-pages-url "&kernel;linux/docs/manpages/man-pages-&man-pages-version;.tar.bz2">
+<!ENTITY man-pages-md5 "2731f0baea4f24793375358d6cd56173">
+<!ENTITY man-pages-home " ">
 
 <!ENTITY mktemp-version "1.5">
 <!ENTITY mktemp-size "69 KB">
 <!ENTITY mktemp-url "ftp://ftp.mktemp.org/pub/mktemp/mktemp-&mktemp-version;.tar.gz">
+<!ENTITY mktemp-md5 "9a35c59502a228c6ce2be025fc6e3ff2">
+<!ENTITY mktemp-home "http://www.mktemp.org/">
 
 <!ENTITY module-init-tools-version "3.2.2">
 <!ENTITY module-init-tools-size "165 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 module-init-tools-home " ">
 
 <!ENTITY ncurses-version "5.5">
 <!ENTITY ncurses-size "2.3 MB">
 <!ENTITY ncurses-url "ftp://invisible-island.net/ncurses/ncurses-&ncurses-version;.tar.gz">
+<!ENTITY ncurses-md5 "e73c1ac10b4bfc46db43b2ddfd6244ef">
+<!ENTITY ncurses-home "http://dickey.his.com/ncurses/">
 
 <!ENTITY patch-version "2.5.9">
 <!ENTITY patch-size "198 KB">
 <!ENTITY patch-url "&alpha-gnu;diffutils/patch-&patch-version;.tar.gz">
+<!ENTITY patch-md5 "dacfb618082f8d3a2194601193cf8716">
+<!ENTITY patch-home "&gnu-software;patch/">
 
 <!ENTITY parted-version "1.6.25.1">
 <!ENTITY parted-size "1.5 MB">
 <!ENTITY parted-url "&gnu;/parted/parted-&parted-version;.tar.gz">
+<!ENTITY parted-md5 "8ad8b2c8aa865d9d6a43a4ecfe021782">
+<!ENTITY parted-home "&gnu-software;parted/">
 
 <!ENTITY perl-version "5.8.8">
 <!ENTITY perl-size "9.7 MB">
 <!ENTITY perl-url "http://ftp.funet.fi/pub/CPAN/src/perl-&perl-version;.tar.bz2">
+<!ENTITY perl-md5 "a377c0c67ab43fd96eeec29ce19e8382">
+<!ENTITY perl-home "http://www.perl.com/">
 
 <!ENTITY powerpcutils-version "1.1.3">
 <!ENTITY powerpcutils-size "25 KB">
 <!ENTITY powerpcutils-url "http://ftp.debian.org/debian/pool/main/p/powerpc-utils/powerpc-utils_&powerpcutils-version;.orig.tar.gz">
+<!ENTITY powerpcutils-md5 "d879b109bb8f0d726304b60b147bff13">
+<!ENTITY powerpcutils-home "http://packages.qa.debian.org/p/powerpc-utils.html">
 
 <!ENTITY procps-version "3.2.6">
 <!ENTITY procps-size "273 KB">
 <!ENTITY procps-url "http://procps.sourceforge.net/procps-&procps-version;.tar.gz">
+<!ENTITY procps-md5 "7ce39ea27d7b3da0e8ad74dd41d06783">
+<!ENTITY procps-home "http://procps.sourceforge.net/">
 
 <!ENTITY psmisc-version "22.2">
 <!ENTITY psmisc-size "239 KB">
 <!ENTITY psmisc-url "&sourceforge;psmisc/psmisc-&psmisc-version;.tar.gz?download">
+<!ENTITY psmisc-md5 "77737c817a40ef2c160a7194b5b64337">
+<!ENTITY psmisc-home "http://psmisc.sourceforge.net/">
 
 <!ENTITY readline-version "5.1">
 <!ENTITY readline-size "1.9 MB">
 <!ENTITY readline-url "&gnu;readline/readline-&readline-version;.tar.gz">
+<!ENTITY readline-md5 "7ee5a692db88b30ca48927a13fd60e46">
+<!ENTITY readline-home "http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html">
 
 <!ENTITY sed-version "4.1.5">
 <!ENTITY sed-size "781 KB">
 <!ENTITY sed-url "&gnu;sed/sed-&sed-version;.tar.gz">
+<!ENTITY sed-md5 "7a1cbbbb3341287308e140bd4834c3ba">
+<!ENTITY sed-home "&gnu-software;sed/">
 
 <!ENTITY shadow-version "4.0.15">
 <!ENTITY shadow-size "1.3 MB">
 <!ENTITY shadow-url "ftp://ftp.pld.org.pl/software/shadow/shadow-&shadow-version;.tar.bz2">
+<!ENTITY shadow-md5 "a0452fa989f8ba45023cc5a08136568e">
+<!ENTITY shadow-home " ">
 
 <!ENTITY silo-version "1.4.11">
 <!ENTITY silo-size "142 KB">
 <!ENTITY silo-url "http://www.sparc-boot.org/pub/silo/silo-&silo-version;.tar.bz2">
+<!ENTITY silo-md5 "37eea1b33d80f6c35d53af9029e30a02">
+<!ENTITY silo-home "http://www.sparc-boot.org/">
 
 <!ENTITY sysklogd-version "1.4.1">
 <!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 sysklogd-home "http://www.infodrom.org/projects/sysklogd/">
 
 <!ENTITY sysvinit-version "2.86">
 <!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 sysvinit-home " ">
 
 <!ENTITY tar-version "1.15.1">
 <!ENTITY tar-size "1.6 MB">
 <!ENTITY tar-url "&gnu;tar/tar-&tar-version;.tar.bz2">
+<!ENTITY tar-md5 "57da3c38f8e06589699548a34d5a5d07">
+<!ENTITY tar-home "&gnu-software;tar/">
 
 <!ENTITY tcl-version "8.4.12">
 <!ENTITY tcl-size "3.3 MB">
 <!ENTITY tcl-url "&sourceforge;tcl/tcl&tcl-version;-src.tar.gz?download">
+<!ENTITY tcl-md5 "7480432d8730263f267952788eb4839b">
+<!ENTITY tcl-home "http://tcl.sourceforge.net/">
 
 <!ENTITY texinfo-version "4.8">
 <!ENTITY texinfo-size "1.5 MB">
 <!ENTITY texinfo-url "&gnu;texinfo/texinfo-&texinfo-version;.tar.bz2">
+<!ENTITY texinfo-md5 "6ba369bbfe4afaa56122e65b3ee3a68c">
+<!ENTITY texinfo-home "&gnu-software;texinfo/">
 
 <!ENTITY tree-version "1.5.0">
 <!ENTITY tree-size "26 KB">
 <!ENTITY tree-url "ftp://mama.indstate.edu/linux/tree/tree-&tree-version;.tgz">
+<!ENTITY tree-md5 "e0d090c564e7ea5afa16bac80620c7e0">
+<!ENTITY tree-home " ">
 
 <!ENTITY udev-version "091">
 <!ENTITY udev-size "288 KB">
 <!ENTITY udev-url "&kernel;linux/utils/kernel/hotplug/udev-&udev-version;.tar.bz2">
+<!ENTITY udev-md5 "4151022ea7b4dcfaa768c1b7bf2ab9e5">
+<!ENTITY udev-home "http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html">
 
 <!ENTITY udev-cross-lfs-version "0.1-04282006">
 <!ENTITY udev-cross-lfs-size "10 KB">
 <!ENTITY udev-cross-lfs-url "http://ftp.jg555.com/udev/udev-cross-lfs-&udev-cross-lfs-version;.tar.bz2">
+<!ENTITY udev-cross-lfs-md5 "e7de1478d59c0f571f8d038251f90b87">
+<!ENTITY udev-cross-lfs-home " ">
 
 <!ENTITY util-linux-version "2.12r">
 <!ENTITY util-linux-size "1.4 MB">
 <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/util-linux-&util-linux-version;.tar.bz2">
+<!ENTITY util-linux-md5 "af9d9e03038481fbf79ea3ac33f116f9">
+<!ENTITY util-linux-home " ">
 
 <!ENTITY yaboot-version "1.3.13">
 <!ENTITY yaboot-size "269 KB">
 <!ENTITY yaboot-url "http://penguinppc.org/bootloaders/yaboot/yaboot-&yaboot-version;.tar.gz">
+<!ENTITY yaboot-md5 "f12798d1b2063f21d07e0ae7f602ccaf">
+<!ENTITY yaboot-home "http://yaboot.ozlabs.org/">
 
 <!ENTITY vim-version "7.0">
@@ -285,8 +423,14 @@
 <!ENTITY vim-size "6.3 MB">
 <!ENTITY vim-url "ftp://ftp.vim.org/pub/vim/unix/vim-&vim-version;.tar.bz2">
+<!ENTITY vim-md5 "4ca69757678272f718b1041c810d82d8">
+<!ENTITY vim-home "http://www.vim.org">
 <!ENTITY vim-language-size "1.2 MB">
 <!ENTITY vim-language-url "ftp://ftp.vim.org/pub/vim/extra/vim-&vim-version;-lang.tar.gz">
+<!ENTITY vim-language-md5 "6d43efaff570b5c86e76b833ea0c6a04">
+<!ENTITY vim-language-home " ">
 
 <!ENTITY zlib-version "1.2.3">
 <!ENTITY zlib-size "416 KB">
 <!ENTITY zlib-url "http://www.zlib.net/zlib-&zlib-version;.tar.gz">
+<!ENTITY zlib-md5 "debc62758716a169df9f62e6ab2bc634">
+<!ENTITY zlib-home "http://www.zlib.net/">
Index: stylesheets/xhtml/lfs-mixed.xsl
===================================================================
--- stylesheets/xhtml/lfs-mixed.xsl	(revision f1acf6b619d8fe91b55bfd7f62a2df75531536eb)
+++ stylesheets/xhtml/lfs-mixed.xsl	(revision 3122a1283579a06c5f648f487f3375e8d58843ba)
@@ -4,4 +4,29 @@
                 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 -->
