Index: chapter03/packages.xml
===================================================================
--- chapter03/packages.xml	(revision da51ba8395fc3c1f2e329e24bc1c2e4b6c6191fa)
+++ chapter03/packages.xml	(revision ac89fabf57bdbd93a5c159339f4a0b19c0cd0231)
@@ -13,14 +13,14 @@
 
 <varlistentry>
-<term>Autoconf (&autoconf-version;) - 903 kilobytes (KB):</term>
-<listitem>
-<para><ulink url="&freshmeat;autoconf/"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Automake (&automake-version;) - 681 KB:</term>
-<listitem>
-<para><ulink url="&freshmeat;automake/"/></para>
+<term>Autoconf (&autoconf-version;) - 903 KB:</term>
+<listitem>
+<para><ulink url="&gnu;autoconf/autoconf-&autoconf-version;.tar.bz2"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>Automake (&automake-version;) - 644 KB:</term>
+<listitem>
+<para><ulink url="&gnu;automake/automake-&automake-version;.tar.bz2"/></para>
 </listitem>
 </varlistentry>
@@ -29,5 +29,5 @@
 <term>Bash (&bash-version;) - 1,910 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;gnubash/"/></para>
+<para><ulink url="&gnu;bash/bash/bash-&bash-version;.tar.gz"/></para>
 </listitem>
 </varlistentry>
@@ -36,19 +36,12 @@
 <term>Binutils (&binutils-version;) - 10,666 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;binutils/?branch_id=12688"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Bison (&bison-version;) - 796 KB:</term>
-<listitem>
-<para><ulink url="ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/bison/"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry arch="raq2">
-<term>BLFS-Bootscripts (&blfs-bootscripts-version;) - 12 KB:</term>
-<listitem>
-<para><ulink url="http://www.linuxfromscratch.org/blfs/downloads/svn/"/></para>
+<para><ulink url="&kernel;linux/devel/binutils/binutils-&binutils-version;.tar.bz2"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>Bison (&bison-version;) - 1,100 KB:</term>
+<listitem>
+<para><ulink url="&gnu;bison/bison-&bison-version;.tar.gz"/></para>
 </listitem>
 </varlistentry>
@@ -57,5 +50,5 @@
 <term>Bzip2 (&bzip2-version;) - 650 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;bzip2/"/></para>
+<para><ulink url="&redhat;bzip2/v&bzip2-dl-version;/bzip-&bzip2-version;.tar.gz"/></para>
 </listitem>
 </varlistentry>
@@ -71,5 +64,5 @@
 <term>Coreutils (&coreutils-version;) - 3,860 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;coreutils/"/></para>
+<para><ulink url="&gnu;coreutils/coreutils-&coreutils-version;.tar.bz2"/></para>
 </listitem>
 </varlistentry>
@@ -78,12 +71,12 @@
 <term>DejaGNU (&dejagnu-version;) - 1,055 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;dejagnu/"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Diffutils (&diffutils-version;) - 762 KB:</term>
-<listitem>
-<para><ulink url="&freshmeat;diffutils/"/></para>
+<para><ulink url="&gnu;dejagnu/dejagnu-&dejagnu-version;.tar.gz"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>Diffutils (&diffutils-version;) - 1034 KB:</term>
+<listitem>
+<para><ulink url="&alpha-gnu;diffutils/diffutils-&diffutils-version;.tar.gz"/></para>
 </listitem>
 </varlistentry>
@@ -92,5 +85,5 @@
 <term>E2fsprogs (&e2fsprogs-version;) - 3,003 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;e2fsprogs/"/></para>
+<para><ulink url="&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz?download"/></para>
 </listitem>
 </varlistentry>
@@ -99,5 +92,5 @@
 <term>Expect (&expect-version;) - 510 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;expect/"/></para>
+<para><ulink url="http://expect.nist.gov/src/expect-&expect-version;.tar.gz"/></para>
 </listitem>
 </varlistentry>
@@ -106,12 +99,5 @@
 <term>File (&file-version;) - 356 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;file/"/></para>
-<beginpage/>
-<note><para>File (&file-version;) may no longer be available at the
-listed location. The site administrators of the master download
-location occasionally remove older versions when new ones are
-released. An alternate download location that may have the correct
-version available is <ulink
-url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>.</para></note>
+<para><ulink url="ftp://ftp.gw.com/mirrors/pub/unix/file/file-&file-version;.tar.gz"/></para>
 </listitem>
 </varlistentry>
@@ -120,40 +106,33 @@
 <term>Findutils (&findutils-version;) - 760 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;findutils/"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Flex (&flex-version;) - 372 KB:</term>
-<listitem>
-<para><ulink url="&freshmeat;flex/"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Gawk (&gawk-version;) - 1,692 KB:</term>
-<listitem>
-<para><ulink url="&freshmeat;gnuawk/"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>GCC (&gcc-version;) - 27,000 KB:</term>
-<listitem>
-<para><ulink url="&freshmeat;gcc/"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Gettext (&gettext-version;) - 6,397 KB:</term>
-<listitem>
-<para><ulink url="&freshmeat;gettext/"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Glibc (&glibc-version;) - 13,101 KB:</term>
-<listitem>
-<para><ulink url="ftp://sources.redhat.com/pub/glibc/snapshots/"/></para>
+<para><ulink url="&alpha-gnu;findutils/findutils-&findutils-version;.tar.gz"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>Flex (&flex-version;) - 66 KB:</term>
+<listitem>
+<para><ulink url="&sourceforge;lex/flex-&flex-version;.tar.bz2?download"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>Gawk (&gawk-version;) - 1,596 KB:</term>
+<listitem>
+<para><ulink url="&gnu;gawk/gawk-&gawk-version;.tar.bz2"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>GCC (&gcc-version;) - ~27,000KB:</term>
+<listitem>
+<para><ulink url="&gnu;gcc/gcc-&gcc-version;.tar.bz2"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>Glibc (&glibc-version;) - 13,800 KB:</term>
+<listitem>
+<para><ulink url="&redhat;glibc/snapshots/glibc-&glibc-version;.tar.bz2"/></para>
 </listitem>
 </varlistentry>
@@ -162,5 +141,5 @@
 <term>Grep (&grep-version;) - 545 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;grep/"/></para>
+<para><ulink url="&gnu;grep/grep-&grep-version;.tar.bz2"/></para>
 </listitem>
 </varlistentry>
@@ -169,5 +148,12 @@
 <term>Groff (&groff-version;) - 2,360 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;groff/"/></para>
+<para><ulink url="&gnu;groff/groff-&groff-version;.tar.bz2"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>Gzip (&gzip-version;) - 324 KB:</term>
+<listitem>
+<para><ulink url="&alpha-gnu;gzip/gzip-&gzip-version;.tar.gz"/></para>
 </listitem>
 </varlistentry>
@@ -176,12 +162,5 @@
 <term>Grub (&grub-version;) - 902 KB:</term>
 <listitem>
-<para><ulink url="ftp://alpha.gnu.org/pub/gnu/grub/"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Gzip (&gzip-version;) - 324 KB:</term>
-<listitem>
-<para><ulink url="ftp://alpha.gnu.org/gnu/gzip/"/></para>
+<para><ulink url="&alpha-gnu;grub/grub-&grub-version;.tar.gz"/></para>
 </listitem>
 </varlistentry>
@@ -190,5 +169,5 @@
 <term>Hotplug (&hotplug-version;) - 34 KB:</term>
 <listitem>
-<para><ulink url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/"/></para>
+<para><ulink url="&kernel;linux/utils/kernel/hotplug/hotplug-&hotplug-version;.tar.bz2"/></para>
 </listitem>
 </varlistentry>
@@ -197,5 +176,5 @@
 <term>Iana-Etc (&iana-etc-version;) - 161 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;iana-etc/"/></para>
+<para><ulink url="http://www.sethwklein.net/projects/iana-etc/downloads/iana-etc-&iana-etc-version;.tar.bz2"/></para>
 </listitem>
 </varlistentry>
@@ -204,12 +183,12 @@
 <term>Inetutils (&inetutils-version;) - 1,019 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;inetutils/"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>IPRoute2 (&iproute2-version;) - 264 KB:</term>
-<listitem>
-<para><ulink url="http://developer.osdl.org/dev/iproute2/download/"/></para>
+<para><ulink url="&gnu;inetutils/inetutils-&inetutils-version;.tar.gz"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>IPRoute2 (&iproute2-version;) - 230 KB:</term>
+<listitem>
+<para><ulink url="http://developer.osdl.org/dev/iproute2/download/iproute2-&iproute2-version;.tar.gz"/></para>
 </listitem>
 </varlistentry>
@@ -218,5 +197,5 @@
 <term>Kbd (&kbd-version;) - 617 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;kbd/"/></para>
+<para><ulink url="&kernel;linux/utils/kbd/kbd-&kbd-version;.tar.bz2"/></para>
 </listitem>
 </varlistentry>
@@ -225,19 +204,19 @@
 <term>Less (&less-version;) - 259 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;less/"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>LFS-Bootscripts (&bootscripts-version;) - 16 KB:</term>
-<listitem>
-<para><ulink url="http://downloads.linuxfromscratch.org/"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry> 
+<para><ulink url="http://www.greenwoodsoftware.com/less/less-&less-version;.tar.gz"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>LFS-Bootscripts (&lfs-bootscripts-version;) - 14 KB:</term>
+<listitem>
+<para><ulink url="http://downloads.linuxfromscratch.org/lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
 <term>Libol (&libol-version;) - 336 KB:</term>
 <listitem>
-<para><ulink url="http://www.balabit.com/downloads/syslog-ng/libol/0.3"/></para>
+<para><ulink url="http://www.balabit.com/downloads/syslog-ng/libol/&libol-dl-version;/libol-&libol-version;.tar.gz"/></para>
 </listitem>
 </varlistentry>
@@ -246,26 +225,54 @@
 <term>Libtool (&libtool-version;) - 2,602 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;libtool/"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
+<para><ulink url="&gnu;libtool/libtool-&libtool-version;.tar.gz/"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry arch="x86">
 <term>Linux (&linux-version;) - 34,793 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;linux/?branch_id=46339"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Linux-Libc-Headers (&linux-libc-headers-version;) - 2,602 KB:</term>
-<listitem>
-<para><ulink url="http://ep09.pld-linux.org/~mmazur/linux-libc-headers/"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>M4 (&m4-version;) - 337 KB:</term>
-<listitem>
-<para><ulink url="&freshmeat;gnum4/"/></para>
+<para><ulink url="&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.bz2"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry arch="raq2">
+<term>Linux (&linux-version;) - 34,793 KB:</term>
+<listitem>
+<para><ulink url="&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-raq2-version;.tar.bz2"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry arch="ppc">
+<term>Linux (&linux-version;) - 34,793 KB:</term>
+<listitem>
+<para><ulink url="&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.bz2"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry arch="x86">
+<term>Linux-Libc-Headers (&linux-libc-headers-version;) - 2,381 KB:</term>
+<listitem>
+<para><ulink url="http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-&linux-libc-headers-version;.tar.bz2"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry arch="raq2">
+<term>Linux-Libc-Headers (&linux-libc-headers-raq2-version;) - 2,381 KB:</term>
+<listitem>
+<para><ulink url="http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-&linux-libc-headers-raq2-version;.tar.bz2"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry arch="ppc">
+<term>Linux-Libc-Headers (&linux-libc-headers-version;) - 2,381 KB:</term>
+<listitem>
+<para><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;) - 310 KB:</term>
+<listitem>
+<para><ulink url="&gnu;m4/m4-&m4-version;.tar.gz"/></para>
 </listitem>
 </varlistentry>
@@ -274,12 +281,12 @@
 <term>Make (&make-version;) - 899 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;gnumake/"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Man (&man-version;) - 223 KB:</term>
-<listitem>
-<para><ulink url="&freshmeat;man/"/></para>
+<para><ulink url="&gnu;make/make-&make-version;.tar.bz2"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>Man (&man-version;) - 196 KB:</term>
+<listitem>
+<para><ulink url="&kernel;linux/utils/man/man-&man-version;.tar.bz2"/></para>
 </listitem>
 </varlistentry>
@@ -288,5 +295,5 @@
 <term>Man-pages (&man-pages-version;) - 1,586 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;man-pages/"/></para>
+<para><ulink url="&kernel;linux/docs/manpages/man-pages-&man-pages-version;.tar.bz2"/></para>
 </listitem>
 </varlistentry>
@@ -295,5 +302,5 @@
 <term>Mktemp (&mktemp-version;) - 69 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;mktemp/"/></para>
+<para><ulink url="ftp://ftp.mktemp.org/pub/mktemp/mktemp-&mktemp-version;.tar.gz"/></para>
 </listitem>
 </varlistentry>
@@ -302,5 +309,5 @@
 <term>Module-Init-Tools (&module-init-tools-version;) - 118 KB:</term>
 <listitem>
-<para><ulink url="ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/"/></para>
+<para><ulink url="&kernel;linux/utils/kernel/module-init-tools/module-init-tools-&module-init-tools-version;.tar.bz2"/></para>
 </listitem>
 </varlistentry>
@@ -309,5 +316,5 @@
 <term>Ncurses (&ncurses-version;) - 2,019 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;ncurses/"/></para>
+<para><ulink url="ftp://invisible-island.net/ncurses/ncurses-&ncurses-version;.tar.gz"/></para>
 </listitem>
 </varlistentry>
@@ -316,5 +323,5 @@
 <term>OpenSSL (&openssl-version;) - 3.0 MB:</term>
 <listitem>
-<para><ulink url="http://www.openssl.org/source/"/></para>
+<para><ulink url="http://www.openssl.org/source/openssl-&openssl-version;.tar.gz"/></para>
 </listitem>
 </varlistentry>
@@ -323,5 +330,5 @@
 <term>OpenSSH (&openssh-version;) - 854 KB:</term>
 <listitem>
-<para><ulink url="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/"/></para>
+<para><ulink url="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-&openssh-version;.tar.gz"/></para>
 </listitem>
 </varlistentry>
@@ -330,5 +337,5 @@
 <term>Patch (&patch-version;) - 182 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;patch/"/></para>
+<para><ulink url="&alpha-gnu;diffutils/patch-&patch-version;.tar.gz"/></para>
 </listitem>
 </varlistentry>
@@ -337,12 +344,12 @@
 <term>Perl (&perl-version;) - 9,373 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;perl/"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Procps (&procps-version;) - 265 KB:</term>
-<listitem>
-<para><ulink url="&freshmeat;procps/"/></para>
+<para><ulink url="http://ftp.funet.fi/pub/CPAN/src/perl-&perl-version;.tar.bz2"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>Procps (&procps-version;) - 256 KB:</term>
+<listitem>
+<para><ulink url="http://procps.sourceforge.net/procps-&procps-version;.tar.gz"/></para>
 </listitem>
 </varlistentry>
@@ -351,5 +358,5 @@
 <term>Psmisc (&psmisc-version;) - 375 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;psmisc/"/></para>
+<para><ulink url="&sourceforge;psmisc/psmisc-&psmisc-version;.tar.gz?download"/></para>
 </listitem>
 </varlistentry>
@@ -358,12 +365,12 @@
 <term>Readline (&readline-version;) - 940 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;gnureadline/"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Sed (&sed-version;) - 749 KB:</term>
-<listitem>
-<para><ulink url="&freshmeat;sed/"/></para>
+<para><ulink url="&gnu;readline/readline-&readline-version;.tar.gz"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>Sed (&sed-version;) - 753 KB:</term>
+<listitem>
+<para><ulink url="&gnu;sed/sed-&sed-version;.tar.gz"/></para>
 </listitem>
 </varlistentry>
@@ -372,5 +379,5 @@
 <term>Shadow (&shadow-version;) - 795 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;shadow/"/></para>
+<para><ulink url="ftp://ftp.pld.org.pl/software/shadow/shadow-&shadow-version;.tar.bz2"/></para>
 </listitem>
 </varlistentry>
@@ -379,5 +386,5 @@
 <term>Syslog-ng (&syslog-ng-version;) - 388 KB:</term>
 <listitem>
-<para><ulink url="http://www.balabit.com/downloads/syslog-ng/1.6/src/"/></para>
+<para><ulink url="http://www.balabit.com/downloads/syslog-ng/&syslog-ng-dl-version;/src/syslog-ng-&syslog-ng-version;.tar.gz"/></para>
 </listitem>
 </varlistentry>
@@ -386,5 +393,5 @@
 <term>Sysvinit (&sysvinit-version;) - 91 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;sysvinit/"/></para>
+<para><ulink url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-&sysvinit-version;.tar.gz"/></para>
 </listitem>
 </varlistentry>
@@ -393,5 +400,5 @@
 <term>Tar (&tar-version;) - 1,025 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;tar/"/></para>
+<para><ulink url="&gnu;tar/tar-&tar-version;.tar.bz2"/></para>
 </listitem>
 </varlistentry>
@@ -400,5 +407,5 @@
 <term>Tcl (&tcl-version;) - 3,363 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;tcltk/"/></para>
+<para><ulink url="&sourceforge;tcl/tcl&tcl-version;-src.tar.gz?download"/></para>
 </listitem>
 </varlistentry>
@@ -407,5 +414,5 @@
 <term>Texinfo (&texinfo-version;) - 1,385 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;texinfo/"/></para>
+<para><ulink url="&gnu;texinfo/textinfo-&texinfo-version;.tar.bz2"/></para>
 </listitem>
 </varlistentry>
@@ -414,5 +421,5 @@
 <term>Udev (&udev-version;) - 374 KB:</term>
 <listitem>
-<para><ulink url="ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/"/></para>
+<para><ulink url="&kernel;/linux/utils/kernel/hotplug/udev-&udev-version;.tar.bz2"/></para>
 </listitem>
 </varlistentry>
@@ -433,7 +440,7 @@
 
 <varlistentry>
-<term>Util-linux (&util-linux-version;) - 1,921 KB:</term>
-<listitem>
-<para><ulink url="&freshmeat;util-linux/"/></para>
+<term>Util-linux (&util-linux-version;) - 1,814 KB:</term>
+<listitem>
+<para><ulink url="ftp://ftp.win.tue.nl/pub/linux-local/utils/util-linux/util-linux-&util-linux-version;.tar.gz"/></para>
 </listitem>
 </varlistentry>
@@ -442,5 +449,5 @@
 <term>Vim (&vim-version;) - 3,612 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;vim/"/></para>
+<para><ulink url="ftp://ftp.vim.org/pub/vim/unix/vim-&vim-version;.tar.bz2"/></para>
 </listitem>
 </varlistentry>
@@ -449,5 +456,5 @@
 <term>Vim (&vim-version;) language files (optional) - 1,033 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;vim/"/></para>
+<para><ulink url="ftp://ftp.vim.org/pub/vim/extra/vim-&vim-version;-lang.tar.gz"/></para>
 </listitem>
 </varlistentry>
@@ -456,5 +463,5 @@
 <term>Yaboot (&yaboot-version;) - 270 KB:</term>
 <listitem>
-<para><ulink url="http://penguinppc.org/bootloaders/yaboot/"/></para>
+<para><ulink url="http://penguinppc.org/bootloaders/yaboot/yaboot-&yaboot-version;.tar.gz"/></para>
 </listitem>
 </varlistentry>
@@ -463,5 +470,5 @@
 <term>Zlib (&zlib-version;) - 277 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;zlib/"/></para>
+<para><ulink url="http://www.zlib.net/zlib-&zlib-version;.tar.gz"/></para>
 </listitem>
 </varlistentry>
