Index: chapter03/packages.xml
===================================================================
--- chapter03/packages.xml	(revision 8cc086603a0658aeb2fcac57a08a808556313b59)
+++ chapter03/packages.xml	(revision ab96e0e3c89ce66b38cce3f0ed3bfede64e3e734)
@@ -18,5 +18,7 @@
       <term>Autoconf (&autoconf-version;) - 908 kilobytes (KB):</term>
       <listitem>
-        <para><ulink url="&gnu;autoconf/"/></para>
+        <para>Home page: <ulink url="&gnu-software;autoconf/"/></para>
+        <para>Download: <ulink
+        url="&gnu;autoconf/autoconf-&autoconf-version;.tar.bz2"/></para>
       </listitem>
     </varlistentry>
@@ -25,5 +27,7 @@
       <term>Automake (&automake-version;) - 748 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;automake/"/></para>
+        <para>Home page: <ulink url="&gnu-software;automake/"/></para>
+        <para>Download: <ulink
+        url="&gnu;automake/automake-&automake-version;.tar.bz2"/></para>
       </listitem>
     </varlistentry>
@@ -32,5 +36,6 @@
       <term>Bash (&bash-version;) - 1,824 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;bash/"/></para>
+        <para>Home page: <ulink url="&gnu-software;bash/"/></para>
+        <para>Download: <ulink url="&gnu;bash/bash-&bash-version;.tar.gz"/></para>
       </listitem>
     </varlistentry>
@@ -39,5 +44,6 @@
       <term>Bash Documentation (&bash-doc-version;) - 1,994 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;bash/"/></para>
+        <para>Download: <ulink
+        url="&gnu;bash/bash-doc-&bash-doc-version;.tar.gz"/></para>
       </listitem>
     </varlistentry>
@@ -46,5 +52,7 @@
       <term>Berkeley DB (&db-version;) - 6,578 KB:</term>
       <listitem>
-        <para><ulink url="http://dev.sleepycat.com/"/></para>
+        <para>Home page: <ulink url="http://dev.sleepycat.com/"/></para>
+        <para>Download: <ulink
+        url="http://downloads.sleepycat.com/db-&db-version;.tar.gz"/></para>
       </listitem>
     </varlistentry>
@@ -53,5 +61,7 @@
       <term>Binutils (&binutils-version;) - 12,272 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;binutils/"/></para>
+        <para>Home page: <ulink url="http://sources.redhat.com/binutils/"/></para>
+        <para>Download: <ulink
+        url="&gnu;binutils/binutils-&binutils-version;.tar.bz2"/></para>
       </listitem>
     </varlistentry>
@@ -60,5 +70,7 @@
       <term>Bison (&bison-version;) - 982 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;bison/"/></para>
+        <para>Home page: <ulink url="&gnu-software;bison/"/></para>
+        <para>Download: <ulink
+        url="&gnu;bison/bison-&bison-version;.tar.gz"/></para>
       </listitem>
     </varlistentry>
@@ -67,5 +79,7 @@
       <term>Bzip2 (&bzip2-version;) - 596 KB:</term>
       <listitem>
-        <para><ulink url="http://www.bzip.org/"/></para>
+        <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>
       </listitem>
     </varlistentry>
@@ -74,5 +88,7 @@
       <term>Coreutils (&coreutils-version;) - 4,929 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;coreutils/"/></para>
+        <para>Home page: <ulink url="&gnu-software;coreutils/"/></para>
+        <para>Download: <ulink
+        url="&gnu;coreutils/coreutils-&coreutils-version;.tar.bz2"/></para>
       </listitem>
     </varlistentry>
@@ -81,5 +97,7 @@
       <term>DejaGNU (&dejagnu-version;) - 852 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;dejagnu/"/></para>
+        <para>Home page: <ulink url="&gnu-software;dejagnu/"/></para>
+        <para>Download: <ulink
+        url="&gnu;dejagnu/dejagnu-&dejagnu-version;.tar.gz"/></para>
       </listitem>
     </varlistentry>
@@ -88,13 +106,17 @@
       <term>Diffutils (&diffutils-version;) - 648 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;diffutils/"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-    <term>E2fsprogs (&e2fsprogs-version;) - 3,120 KB:</term>
-    <listitem>
-    <para><ulink url="&sourceforge;e2fsprogs/"/></para>
-    </listitem>
+        <para>Home page: <ulink url="&gnu-software;diffutils/"/></para>
+        <para>Download: <ulink
+        url="&gnu;diffutils/diffutils-&diffutils-version;.tar.gz"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>E2fsprogs (&e2fsprogs-version;) - 3,120 KB:</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>
+      </listitem>
     </varlistentry>
 
@@ -102,5 +124,7 @@
       <term>Expect (&expect-version;) - 416 KB:</term>
       <listitem>
-        <para><ulink url="http://expect.nist.gov/src/"/></para>
+        <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>
       </listitem>
     </varlistentry>
@@ -109,5 +133,6 @@
       <term>File (&file-version;) - 404 KB:</term>
       <listitem>
-        <para><ulink url="ftp://ftp.gw.com/mirrors/pub/unix/file/"/></para>
+        <para>Download: <ulink
+        url="ftp://ftp.gw.com/mirrors/pub/unix/file/file-&file-version;.tar.gz"/></para>
 
         <note>
@@ -125,5 +150,7 @@
       <term>Findutils (&findutils-version;) - 887 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;findutils/"/></para>
+        <para>Home page: <ulink url="&gnu-software;findutils/"/></para>
+        <para>Download: <ulink
+        url="&gnu;findutils/findutils-&findutils-version;.tar.gz"/></para>
       </listitem>
     </varlistentry>
@@ -132,5 +159,7 @@
       <term>Flex (&flex-version;) - 679 KB:</term>
       <listitem>
-        <para><ulink url="&sourceforge;flex/"/></para>
+        <para>Home page: <ulink url="http://flex.sourceforge.net"/></para>
+        <para>Download: <ulink
+        url="&sourceforge;flex/flex-&flex-version;.tar.bz2?download"/></para>
       </listitem>
     </varlistentry>
@@ -139,5 +168,6 @@
       <term>Gawk (&gawk-version;) - 1,696 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;gawk/"/></para>
+        <para>Home page: <ulink url="&gnu-software;gawk/"/></para>
+        <para>Download: <ulink url="&gnu;gawk/gawk-&gawk-version;.tar.bz2"/></para>
       </listitem>
     </varlistentry>
@@ -146,5 +176,7 @@
       <term>GCC (&gcc-version;) - 32,208 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;gcc/"/></para>
+        <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>
       </listitem>
     </varlistentry>
@@ -153,5 +185,7 @@
       <term>Gettext (&gettext-version;) - 4,668 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;gettext/"/></para>
+        <para>Home page: <ulink url="&gnu-software;gettext/"/></para>
+        <para>Download: <ulink
+        url="&gnu;gettext/gettext-&gettext-version;.tar.gz"/></para>
       </listitem>
     </varlistentry>
@@ -160,5 +194,7 @@
       <term>Glibc (&glibc-version;) - 13,687 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;glibc/"/></para>
+        <para>Home page: <ulink url="&gnu-software;libc/"/></para>
+        <para>Download: <ulink
+        url="&gnu;glibc/glibc-&glibc-version;.tar.bz2"/></para>
       </listitem>
     </varlistentry>
@@ -167,5 +203,6 @@
       <term>Glibc LibIDN add-on (&glibc-version;) - 100 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;glibc/"/></para>
+        <para>Download: <ulink
+        url="&gnu;glibc/glibc-libidn-&glibc-version;.tar.bz2"/></para>
       </listitem>
     </varlistentry>
@@ -174,5 +211,6 @@
       <term>Grep (&grep-version;) - 520 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;grep/"/></para>
+        <para>Home page: <ulink url="&gnu-software;grep/"/></para>
+        <para>Download: <ulink url="&gnu;grep/grep-&grep-version;.tar.bz2"/></para>
       </listitem>
     </varlistentry>
@@ -181,5 +219,7 @@
       <term>Groff (&groff-version;) - 2,260 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;groff/"/></para>
+        <para>Home page: <ulink url="&gnu-software;groff/"/></para>
+        <para>Download: <ulink
+        url="&gnu;groff/groff-&groff-version;.tar.gz"/></para>
       </listitem>
     </varlistentry>
@@ -188,5 +228,7 @@
       <term>GRUB (&grub-version;) - 772 KB:</term>
       <listitem>
-        <para><ulink url="&alpha-gnu;grub/"/></para>
+        <para>Home page: <ulink url="&gnu-software;grub/"/></para>
+        <para>Download: <ulink
+        url="&alpha-gnu;grub/grub-&grub-version;.tar.gz"/></para>
       </listitem>
     </varlistentry>
@@ -195,5 +237,7 @@
       <term>Gzip (&gzip-version;) - 284 KB:</term>
       <listitem>
-        <para><ulink url="&alpha-gnu;gzip/"/></para>
+        <para>Home page: <ulink url="http://www.gzip.org/"/></para>
+        <para>Download: <ulink
+        url="&alpha-gnu;gzip/gzip-&gzip-version;.tar.gz"/></para>
       </listitem>
     </varlistentry>
@@ -202,5 +246,6 @@
       <term>Hotplug (&hotplug-version;) - 40 KB:</term>
       <listitem>
-        <para><ulink url="&kernel;linux/utils/kernel/hotplug/"/></para>
+        <para>Download: <ulink
+        url="&kernel;linux/utils/kernel/hotplug/hotplug-&hotplug-version;.tar.bz2"/></para>
       </listitem>
     </varlistentry>
@@ -209,5 +254,8 @@
       <term>Iana-Etc (&iana-etc-version;) - 174 KB:</term>
       <listitem>
-        <para><ulink url="http://www.sethwklein.net/projects/iana-etc/downloads/"/></para>
+        <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>
       </listitem>
     </varlistentry>
@@ -216,5 +264,7 @@
       <term>Inetutils (&inetutils-version;) - 752 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;inetutils/"/></para>
+        <para>Home page: <ulink url="&gnu-software;inetutils/"/></para>
+        <para>Download: <ulink
+        url="&gnu;inetutils/inetutils-&inetutils-version;.tar.gz"/></para>
       </listitem>
     </varlistentry>
@@ -223,5 +273,8 @@
       <term>IPRoute2 (&iproute2-version;) - 291 KB:</term>
       <listitem>
-        <para><ulink url="http://developer.osdl.org/dev/iproute2/download/"/></para>
+        <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>
       </listitem>
     </varlistentry>
@@ -230,5 +283,6 @@
       <term>Kbd (&kbd-version;) - 624 KB:</term>
       <listitem>
-        <para><ulink url="&kernel;linux/utils/kbd/"/></para>
+        <para>Download: <ulink
+        url="&kernel;linux/utils/kbd/kbd-&kbd-version;.tar.bz2"/></para>
       </listitem>
     </varlistentry>
@@ -237,6 +291,8 @@
       <term>Less (&less-version;) - 216 KB:</term>
       <listitem>
-        <!-- <para><ulink url="&gnu;less/"/></para> -->
-        <para><ulink url="http://www.greenwoodsoftware.com/less/"/></para>
+        <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>
       </listitem>
     </varlistentry>
@@ -245,5 +301,6 @@
       <term>LFS-Bootscripts (&lfs-bootscripts-version;) - 32 KB:</term>
       <listitem>
-        <para><ulink url="http://www.linuxfromscratch.org/~dj/bootscripts/"/></para>
+        <para>Download: <ulink
+        url="http://www.linuxfromscratch.org/~dj/bootscripts/lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2"/></para>
       </listitem>
     </varlistentry>
@@ -252,5 +309,7 @@
       <term>Libtool (&libtool-version;) - 1,761 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;libtool/"/></para>
+        <para>Home page: <ulink url="&gnu-software;libtool/"/></para>
+        <para>Download: <ulink
+        url="&gnu;libtool/libtool-&libtool-version;.tar.gz"/></para>
       </listitem>
     </varlistentry>
@@ -259,5 +318,7 @@
       <term>Linux (&linux-version;) - 36,522 KB:</term>
       <listitem>
-        <para><ulink url="&kernel;linux/kernel/v&linux-dl-version;/"/></para>
+        <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>
       </listitem>
     </varlistentry>
@@ -266,5 +327,6 @@
       <term>Linux-Libc-Headers (&linux-libc-headers-version;) - 2,480 KB:</term>
       <listitem>
-        <para><ulink url="http://ep09.pld-linux.org/~mmazur/linux-libc-headers/"/></para>
+        <para>Download: <ulink
+        url="http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-&linux-libc-headers-version;.tar.bz2"/></para>
       </listitem>
     </varlistentry>
@@ -273,5 +335,6 @@
       <term>M4 (&m4-version;) - 300 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;m4/"/></para>
+        <para>Home page: <ulink url="&gnu-software;m4/"/></para>
+        <para>Download: <ulink url="&gnu;m4/m4-&m4-version;.tar.gz"/></para>
       </listitem>
     </varlistentry>
@@ -280,5 +343,6 @@
       <term>Make (&make-version;) - 904 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;make/"/></para>
+        <para>Home page: <ulink url="&gnu-software;make/"/></para>
+        <para>Download: <ulink url="&gnu;make/make-&make-version;.tar.bz2"/></para>
       </listitem>
     </varlistentry>
@@ -287,5 +351,7 @@
       <term>Man-DB (&man-db-version;) - 816 KB:</term>
       <listitem>
-        <para><ulink url="http://savannah.nongnu.org/download/man-db/"/></para>
+        <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>
       </listitem>
     </varlistentry>
@@ -294,5 +360,6 @@
       <term>Man-pages (&man-pages-version;) - 1,720 KB:</term>
       <listitem>
-        <para><ulink url="&kernel;linux/docs/manpages/"/></para>
+        <para>Download: <ulink
+        url="&kernel;linux/docs/manpages/man-pages-&man-pages-version;.tar.bz2"/></para>
       </listitem>
     </varlistentry>
@@ -301,5 +368,7 @@
       <term>Mktemp (&mktemp-version;) - 68 KB:</term>
       <listitem>
-        <para><ulink url="ftp://ftp.mktemp.org/pub/mktemp/"/></para>
+        <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>
       </listitem>
     </varlistentry>
@@ -308,5 +377,6 @@
       <term>Module-Init-Tools (&module-init-tools-version;) - 165 KB:</term>
       <listitem>
-        <para><ulink url="&kernel;linux/utils/kernel/module-init-tools/"/></para>
+        <para>Download: <ulink
+        url="&kernel;linux/utils/kernel/module-init-tools/module-init-tools-&module-init-tools-version;.tar.bz2"/></para>
       </listitem>
     </varlistentry>
@@ -315,5 +385,7 @@
       <term>Ncurses (&ncurses-version;) - 1,683 KB:</term>
       <listitem>
-        <para><ulink url="ftp://invisible-island.net/ncurses/"/></para>
+        <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>
       </listitem>
     </varlistentry>
@@ -338,5 +410,7 @@
       <term>Patch (&patch-version;) - 156 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;patch/"/></para>
+        <para>Home page: <ulink url="&gnu-software;patch/"/></para>
+        <para>Download: <ulink
+        url="&gnu;patch/patch-&patch-version;.tar.gz"/></para>
       </listitem>
     </varlistentry>
@@ -345,5 +419,7 @@
       <term>Perl (&perl-version;) - 9,886 KB:</term>
       <listitem>
-        <para><ulink url="http://ftp.funet.fi/pub/CPAN/src/"/></para>
+        <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>
       </listitem>
     </varlistentry>
@@ -352,5 +428,7 @@
       <term>Procps (&procps-version;) - 221 KB:</term>
       <listitem>
-        <para><ulink url="http://procps.sourceforge.net/"/></para>
+        <para>Home page: <ulink url="http://procps.sourceforge.net/"/></para>
+        <para>Download: <ulink
+        url="http://procps.sourceforge.net/procps-&procps-version;.tar.gz"/></para>
       </listitem>
     </varlistentry>
@@ -359,5 +437,7 @@
       <term>Psmisc (&psmisc-version;) - 199 KB:</term>
       <listitem>
-        <para><ulink url="&sourceforge;psmisc/"/></para>
+        <para>Home page: <ulink url="http://psmisc.sourceforge.net/"/></para>
+        <para>Download: <ulink
+        url="&sourceforge;psmisc/psmisc-&psmisc-version;.tar.gz?download"/></para>
       </listitem>
     </varlistentry>
@@ -366,5 +446,8 @@
       <term>Readline (&readline-version;) - 1,456 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;readline/"/></para>
+        <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>
       </listitem>
     </varlistentry>
@@ -373,5 +456,6 @@
       <term>Sed (&sed-version;) - 631 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;sed/"/></para>
+        <para>Home page: <ulink url="&gnu-software;sed/"/></para>
+        <para>Download: <ulink url="&gnu;sed/sed-&sed-version;.tar.gz"/></para>
       </listitem>
     </varlistentry>
@@ -380,5 +464,6 @@
       <term>Shadow (&shadow-version;) - 1,265 KB:</term>
       <listitem>
-        <para><ulink url="ftp://ftp.pld.org.pl/software/shadow/"/></para>
+        <para>Download: <ulink
+        url="ftp://ftp.pld.org.pl/software/shadow/shadow-&shadow-version;.tar.bz2"/></para>
 
         <note>
@@ -396,5 +481,8 @@
       <term>Sysklogd (&sysklogd-version;) - 72 KB:</term>
       <listitem>
-        <para><ulink url="http://www.infodrom.org/projects/sysklogd/download/"/></para>
+        <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>
       </listitem>
     </varlistentry>
@@ -403,5 +491,6 @@
       <term>Sysvinit (&sysvinit-version;) - 88 KB:</term>
       <listitem>
-        <para><ulink url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/"/></para>
+        <para>Download: <ulink
+        url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-&sysvinit-version;.tar.gz"/></para>
       </listitem>
     </varlistentry>
@@ -410,5 +499,6 @@
       <term>Tar (&tar-version;) - 1,580 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;tar/"/></para>
+        <para>Home page: <ulink url="&gnu-software;tar/"/></para>
+        <para>Download: <ulink url="&gnu;tar/tar-&tar-version;.tar.bz2"/></para>
       </listitem>
     </varlistentry>
@@ -417,5 +507,7 @@
       <term>Tcl (&tcl-version;) - 2,672 KB:</term>
       <listitem>
-        <para><ulink url="&sourceforge;tcl/"/></para>
+        <para>Home page: <ulink url="http://tcl.sourceforge.net/"/></para>
+        <para>Download: <ulink
+        url="&sourceforge;tcl/tcl&tcl-version;-src.tar.gz?download"/></para>
       </listitem>
     </varlistentry>
@@ -424,5 +516,7 @@
       <term>Texinfo (&texinfo-version;) - 1,492 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;texinfo/"/></para>
+        <para>Home page: <ulink url="&gnu-software;texinfo/"/></para>
+        <para>Download: <ulink
+        url="&gnu;texinfo/texinfo-&texinfo-version;.tar.bz2"/></para>
       </listitem>
     </varlistentry>
@@ -431,5 +525,8 @@
       <term>Udev (&udev-version;) - 427 KB:</term>
       <listitem>
-        <para><ulink url="&kernel;linux/utils/kernel/hotplug/"/></para>
+        <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>
       </listitem>
     </varlistentry>
@@ -438,5 +535,6 @@
       <term>Udev Rules Configuration - 5 KB:</term>
       <listitem>
-        <para><ulink url="http://downloads.linuxfromscratch.org/&udev-config-file;"/></para>
+        <para>Download: <ulink
+        url="http://downloads.linuxfromscratch.org/&udev-config-file;"/></para>
       </listitem>
     </varlistentry>
@@ -445,5 +543,6 @@
       <term>Util-linux (&util-linux-version;) - 1,344 KB:</term>
       <listitem>
-        <para><ulink url="&kernel;linux/utils/util-linux/"/></para>
+        <para>Download: <ulink
+        url="&kernel;linux/utils/util-linux/util-linux-&util-linux-version;.tar.bz2"/></para>
       </listitem>
     </varlistentry>
@@ -452,5 +551,7 @@
       <term>Vim (&vim-version;) - 3,650 KB:</term>
       <listitem>
-        <para><ulink url="ftp://ftp.vim.org/pub/vim/unix/"/></para>
+        <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>
       </listitem>
     </varlistentry>
@@ -459,5 +560,6 @@
       <term>Vim (&vim-version;) language files (optional) - 540 KB:</term>
       <listitem>
-        <para><ulink url="ftp://ftp.vim.org/pub/vim/extra/"/></para>
+        <para>Download: <ulink
+        url="ftp://ftp.vim.org/pub/vim/extra/vim-&vim-version;-lang.tar.gz"/></para>
       </listitem>
     </varlistentry>
@@ -466,5 +568,7 @@
       <term>Zlib (&zlib-version;) - 415 KB:</term>
       <listitem>
-        <para><ulink url="http://www.zlib.net/"/></para>
+        <para>Home page: <ulink url="http://www.zlib.net/"/></para>
+        <para>Download: <ulink
+        url="http://www.zlib.net/zlib-&zlib-version;.tar.gz"/></para>
       </listitem>
     </varlistentry>
