diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 16879e3b6..0ec8d5f77 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
     <listitem>
       <para>April 6, 2006</para>
       <itemizedlist>
+        <listitem>
+          <para>[manuel] - Placed home page (when available) and full download
+          links for all packages in chapter03/packages.xml.</para>
+        </listitem>
         <listitem>
           <para>[jhuntwork] - Merged alphabetical branch to trunk.</para>
         </listitem>
@@ -317,7 +321,7 @@
         </listitem>
       </itemizedlist>
     </listitem>
-    
+
     <listitem>
       <para>January 24, 2006</para>
       <itemizedlist>
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 4347d5c38..da1489765 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -17,98 +17,123 @@
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <term>Diffutils (&diffutils-version;) - 648 KB:</term>
       <listitem>
-        <para><ulink url="&gnu;diffutils/"/></para>
+        <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><ulink url="&sourceforge;e2fsprogs/"/></para>
-    </listitem>
+      <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
           <para>File (&file-version;) may no longer be available at the
@@ -124,197 +149,244 @@
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
@@ -337,49 +409,62 @@
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
           <para>Shadow (&shadow-version;) may no longer be available at the
@@ -395,77 +480,96 @@
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
     <varlistentry>
       <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>
 
diff --git a/general.ent b/general.ent
index 1c44a1286..fbeed2bb2 100644
--- a/general.ent
+++ b/general.ent
@@ -19,6 +19,7 @@
 <!ENTITY dependencies "Installation depends on">
 
 <!ENTITY gnu "http://ftp.gnu.org/gnu/">
+<!ENTITY gnu-software "http://www.gnu.org/software/">
 <!ENTITY alpha-gnu "ftp://alpha.gnu.org/gnu/">
 <!ENTITY kernel "http://www.kernel.org/pub/">
 <!ENTITY sourceforge "http://prdownloads.sourceforge.net/">
diff --git a/stylesheets/lfs.css b/stylesheets/lfs.css
index 968ebcbb7..29ef4423b 100644
--- a/stylesheets/lfs.css
+++ b/stylesheets/lfs.css
@@ -213,6 +213,9 @@ div.variablelist dd {
 
 div.variablelist dd p {
   margin-top: 0px;
+  margin-bottom: 0px;
+  padding-top: 0px;
+  padding-bottom: 0px;
 }
 
 div.materials dd {
diff --git a/stylesheets/pdf/lfs-mixed.xsl b/stylesheets/pdf/lfs-mixed.xsl
index 065128f1b..ac096e5c9 100644
--- a/stylesheets/pdf/lfs-mixed.xsl
+++ b/stylesheets/pdf/lfs-mixed.xsl
@@ -5,14 +5,15 @@
                 version="1.0">
 
 
-    <!-- This is a hack and isn't correct semantically. Theoretically, the beginpage 
-      tags should be placed in the XML source only to render the PDF output and 
+    <!-- This is a hack and isn't correct semantically. Theoretically, the beginpage
+      tags should be placed in the XML source only to render the PDF output and
       should be removed after it. But there is no a better way and we need this.-->
   <xsl:template match="beginpage">
     <fo:block break-after="page"/>
   </xsl:template>
-  
-    <!-- Allow forced line breaks inside paragraphs emulating literallayout. -->
+
+    <!-- Allow forced line breaks inside paragraphs emulating literallayout
+    and to remove vertical space in pachages and patches pages. -->
  <xsl:template match="para">
     <xsl:choose>
       <xsl:when test="./@remap='verbatim'">
@@ -25,6 +26,15 @@
           <xsl:apply-templates/>
         </fo:block>
       </xsl:when>
+      <xsl:when test="ancestor::variablelist/@role = 'materials'">
+        <fo:block>
+          <xsl:attribute name="space-before.optimum">0.1em</xsl:attribute>
+          <xsl:attribute name="space-before.minimum">0em</xsl:attribute>
+          <xsl:attribute name="space-before.maximum">0.2em</xsl:attribute>
+          <xsl:call-template name="anchor"/>
+          <xsl:apply-templates/>
+        </fo:block>
+      </xsl:when>
       <xsl:otherwise>
         <xsl:apply-imports/>
       </xsl:otherwise>
@@ -217,31 +227,31 @@
 
     <!-- Addibg a bullet, and left alignament, for packages and paches list. -->
 
-<xsl:template match="varlistentry" mode="vl.as.blocks">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-  <xsl:choose>
-    <xsl:when test="ancestor::variablelist/@role = 'materials'">
-      <fo:block id="{$id}" xsl:use-attribute-sets="list.item.spacing"
-          keep-together.within-column="always"
-          keep-with-next.within-column="always" text-align="left">
-        <xsl:text>&#x2022;   </xsl:text>
-        <xsl:apply-templates select="term"/>
-      </fo:block>
-      <fo:block margin-left="1.4pc" text-align="left">
-        <xsl:apply-templates select="listitem"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block id="{$id}" xsl:use-attribute-sets="list.item.spacing"
-          keep-together.within-column="always"
-          keep-with-next.within-column="always">
-        <xsl:apply-templates select="term"/>
-      </fo:block>
-      <fo:block margin-left="0.25in">
-        <xsl:apply-templates select="listitem"/>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
+  <xsl:template match="varlistentry" mode="vl.as.blocks">
+    <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
+    <xsl:choose>
+      <xsl:when test="ancestor::variablelist/@role = 'materials'">
+        <fo:block id="{$id}" xsl:use-attribute-sets="list.item.spacing"
+            keep-together.within-column="always"
+            keep-with-next.within-column="always" text-align="left">
+          <xsl:text>&#x2022;   </xsl:text>
+          <xsl:apply-templates select="term"/>
+        </fo:block>
+        <fo:block margin-left="1.4pc" text-align="left">
+          <xsl:apply-templates select="listitem"/>
+        </fo:block>
+      </xsl:when>
+      <xsl:otherwise>
+        <fo:block id="{$id}" xsl:use-attribute-sets="list.item.spacing"
+            keep-together.within-column="always"
+            keep-with-next.within-column="always">
+          <xsl:apply-templates select="term"/>
+        </fo:block>
+        <fo:block margin-left="0.25in">
+          <xsl:apply-templates select="listitem"/>
+        </fo:block>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:template>
 
 </xsl:stylesheet>