diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c743901ec..c3896257f 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -81,6 +81,9 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>March 2, 2005 [jim]: Update download locations
+</para></listitem>
+
 <listitem><para>February 28, 2005 [jim]: Upgraded bash fixes patch to -3
 </para></listitem>
 
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index ea18f08ae..b1f37a82b 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -14,84 +14,84 @@
 <varlistentry>
 <term>Autoconf (&autoconf-version;) - 903 kilobytes (KB):</term>
 <listitem>
-<para><ulink url="&freshmeat;autoconf/"/></para>
+<para><ulink url="&gnu;autoconf/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Automake (&automake-version;) - 740 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;automake/"/></para>
+<para><ulink url="&gnu;automake/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Bash (&bash-version;) - 2,362 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;gnubash/"/></para>
+<para><ulink url="&gnu;bash/bash/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Binutils (&binutils-version;) - 11,036 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;binutils/?branch_id=12688"/></para>
+<para><ulink url="&kernel;linux/devel/binutils/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Bison (&bison-version;) - 1,136 KB:</term>
 <listitem>
-<para><ulink url="ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/conglomeration/bison/"/></para>
+<para><ulink url="&gnu;bison/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Bzip2 (&bzip2-version;) - 653 KB:</term>
 <listitem>
-<para><ulink url="http://www.bzip.org/"/></para>
+<para><ulink url="http://www.bzip.org"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Coreutils (&coreutils-version;) - 4,171 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;coreutils/"/></para>
+<para><ulink url="&gnu;coreutils/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>DejaGNU (&dejagnu-version;) - 1,067 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;dejagnu/"/></para>
+<para><ulink url="&gnu;dejagnu/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Diffutils (&diffutils-version;) - 762 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;diffutils/"/></para>
+<para><ulink url="&gnu;diffutils/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>E2fsprogs (&e2fsprogs-version;) - 3,188 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;e2fsprogs/"/></para>
+<para><ulink url="&sourceforge;e2fsprogs/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Expect (&expect-version;) - 513 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;expect/"/></para>
+<para><ulink url="http://expect.nist.gov/src/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>File (&file-version;) - 411 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;file/"/></para>
+<para><ulink url="ftp://ftp.gw.com/mirrors/pub/unix/file/"/></para>
 <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
@@ -104,98 +104,98 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>.</para></note>
 <varlistentry>
 <term>Findutils (&findutils-version;) - 920 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;findutils/"/></para>
+<para><ulink url="&alpha-gnu;findutils/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Flex (&flex-version;) - 666 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;flex/"/></para>
+<para><ulink url="&sourceforge;lex/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Gawk (&gawk-version;) - 1,692 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;gnuawk/"/></para>
+<para><ulink url="&gnu;gawk/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>GCC (&gcc-version;) - 17,714 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;gcc/"/></para>
+<para><ulink url="&gnu;gcc/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Gettext (&gettext-version;) - 6,814 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;gettext/"/></para>
+<para><ulink url="&gnu;gettext/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Glibc (&glibc-version;) - 12,904 KB:</term>
 <listitem>
-<para><ulink url="ftp://sources.redhat.com/pub/glibc/snapshots/"/></para>
+<para><ulink url="&gnu;/glibc/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Glibc-Linuxthreads (&glibc-version;) - 231 KB: </term>
 <listitem>
-<para><ulink url="http://ftp.gnu.org/gnu/glibc/"/></para>
+<para><ulink url="&gnu;/glibc/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Grep (&grep-version;) - 515 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;grep/"/></para>
+<para><ulink url="&gnu;grep/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Groff (&groff-version;) - 2,568 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;groff/"/></para>
+<para><ulink url="&gnu;groff/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Grub (&grub-version;) - 963 KB:</term>
 <listitem>
-<para><ulink url="ftp://alpha.gnu.org/pub/gnu/grub/"/></para>
+<para><ulink url="&alpha-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;gzip/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Hotplug (&hotplug-version;) - 37 KB:</term>
 <listitem>
-<para><ulink url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/"/></para>
+<para><ulink url="&kernel;linux/utils/kernel/hotplug/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Iana-Etc (&iana-etc-version;) - 168 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;iana-etc/"/></para>
+<para><ulink url="http://www.sethwklein.net/projects/iana-etc/downloads/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Inetutils (&inetutils-version;) - 1,019 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;inetutils/"/></para>
+<para><ulink url="&gnu;inetutils/"/></para>
 </listitem>
 </varlistentry>
 
@@ -209,14 +209,14 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>.</para></note>
 <varlistentry>
 <term>Kbd (&kbd-version;) - 618 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;kbd/"/></para>
+<para><ulink url="&kernel;linux/utils/kbd/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Less (&less-version;) - 258 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;less/"/></para>
+<para><ulink url="http://www.greenwoodsoftware.com/less/download.html"/></para>
 </listitem>
 </varlistentry>
 
@@ -230,21 +230,21 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>.</para></note>
 <varlistentry> 
 <term>Libol (&libol-version;) - 337 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;"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Libtool (&libtool-version;) - 2,668 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;libtool/"/></para>
+<para><ulink url="&gnu;libtool/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Linux (&linux-version;) - 35,677 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;linux/?branch_id=46339"/></para>
+<para><ulink url="&kernel;linux/kernel/v&linux-dl-version;/"/></para>
 </listitem>
 </varlistentry>
 
@@ -258,140 +258,140 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>.</para></note>
 <varlistentry>
 <term>M4 (&m4-version;) - 337 KB:</term>
 <listitem>
-<para><ulink url="ftp://ftp.gnu.org/gnu/m4/"/></para>
+<para><ulink url="&gnu;m4/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Make (&make-version;) - 899 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;gnumake/"/></para>
+<para><ulink url="&gnu;make/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Man (&man-version;) - 228 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;man/"/></para>
+<para><ulink url="&kernel;linux/utils/man/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Man-pages (&man-pages-version;) - 1,632 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;man-pages/"/></para>
+<para><ulink url="&kernel;linux/docs/manpages/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Mktemp (&mktemp-version;) - 69 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;mktemp/"/></para>
+<para><ulink url="ftp://ftp.mktemp.org/pub/mktemp/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Module-Init-Tools (&module-init-tools-version;) - 120 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/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Ncurses (&ncurses-version;) - 2,104 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;ncurses/"/></para>
+<para><ulink url="ftp://invisible-island.net/ncurses/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Patch (&patch-version;) - 182 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;patch/"/></para>
+<para><ulink url="&gnu;patch/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Perl (&perl-version;) - 9,466 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;perl/"/></para>
+<para><ulink url="http://ftp.funet.fi/pub/CPAN/src/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Procps (&procps-version;) - 271 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;procps/"/></para>
+<para><ulink url="http://procps.sourceforge.net/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Psmisc (&psmisc-version;) - 374 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;psmisc/"/></para>
+<para><ulink url="&sourceforge;psmisc/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Readline (&readline-version;) - 1,767 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;gnureadline/"/></para>
+<para><ulink url="&gnu;readline/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Sed (&sed-version;) - 776 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;sed/"/></para>
+<para><ulink url="&gnu;sed/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Shadow (&shadow-version;) - 996 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;shadow/"/></para>
+<para><ulink url="ftp://ftp.pld.org.pl/software/shadow/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Syslog-ng (&syslog-ng-version;) - 369 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/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Sysvinit (&sysvinit-version;) - 97 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;sysvinit/"/></para>
+<para><ulink url="ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Tar (&tar-version;) - 1,574 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;tar/"/></para>
+<para><ulink url="&gnu;tar/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Tcl (&tcl-version;) - 3,414 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;tcltk/"/></para>
+<para><ulink url="&sourceforge;tcl/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Texinfo (&texinfo-version;) - 1,486 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;texinfo/"/></para>
+<para><ulink url="&gnu;texinfo/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Udev (&udev-version;) - 351 KB:</term>
 <listitem>
-<para><ulink url="ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/"/></para>
+<para><ulink url="&kernel;/linux/utils/kernel/hotplug/"/></para>
 </listitem>
 </varlistentry>
 
@@ -412,34 +412,33 @@ url="ftp://ftp.linuxfromscratch.org/pub/lfs/"/>.</para></note>
 <varlistentry>
 <term>Util-linux (&util-linux-version;) - 1,339 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;util-linux/"/></para>
+<para><ulink url="&kernel;/linux/utils/util-linux/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Vim (&vim-version;) - 3,613 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;vim/"/></para>
+<para><ulink url="ftp://ftp.vim.org/pub/vim/unix/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <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/"/></para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>Zlib (&zlib-version;) - 363 KB:</term>
 <listitem>
-<para><ulink url="&freshmeat;zlib/"/></para>
+<para><ulink url="http://www.zlib.net/"/></para>
 </listitem>
 </varlistentry>
 
 </variablelist>
 
-<para>Total size of these packages: 135 MB</para>
+<para>Total size of these packages: 170 MB</para>
 
 </sect1>
-
diff --git a/general.ent b/general.ent
index ac56e4174..7c2fe7a0a 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20050228">
-<!ENTITY releasedate "Febraury 28, 2005">
+<!ENTITY version "SVN-20050302">
+<!ENTITY releasedate "March 02, 2005">
 <!ENTITY milestone "6.1">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
@@ -10,12 +10,16 @@
 <!ENTITY hints-index "&lfs-root;hints/list.html">
 <!ENTITY patches-root "&lfs-root;patches/lfs/svn/trunk/">
 <!ENTITY wiki-root "http://wiki.linuxfromscratch.org/">
-<!ENTITY freshmeat "http://freshmeat.net/projects/">
 
 <!ENTITY buildtime "Approximate build time">
 <!ENTITY diskspace "Required disk space">
 <!ENTITY dependencies "Installation depends on">
 
+<!ENTITY gnu "http://ftp.gnu.org/gnu/">
+<!ENTITY alpha-gnu "ftp://alpha.gnu.org/gnu/">
+<!ENTITY kernel "http://www.kernel.org/pub/">
+<!ENTITY sourceforge "http://prdownloads.sourceforge.net/">
+
 <!ENTITY autoconf-version "2.59">
 <!ENTITY automake-version "1.9.5">
 <!ENTITY bash-version "3.0">
@@ -47,8 +51,10 @@
 <!ENTITY less-version "382">
 <!ENTITY lfs-bootscripts-version "3.1.0">
 <!ENTITY libol-version "0.3.15">
+<!ENTITY libol-dl-version "0.3">
 <!ENTITY libtool-version "1.5.14">
 <!ENTITY linux-version "2.6.10">
+<!ENTITY linux-dl-version "2.6">
 <!ENTITY linux-libc-headers-version "2.6.10.0">
 <!ENTITY m4-version "1.4.2">
 <!ENTITY make-version "3.80">
@@ -65,6 +71,7 @@
 <!ENTITY sed-version "4.1.4">
 <!ENTITY shadow-version "4.0.7">
 <!ENTITY syslog-ng-version "1.6.6">
+<!ENTITY syslog-ng-dl-version "1.6">
 <!ENTITY sysvinit-version "2.86">
 <!ENTITY tar-version "1.15.1">
 <!ENTITY tcl-version "8.4.9">