diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f12cd3cf3..b72dc9ff3 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
     <listitem>
       <para>2007-08-27</para>
       <itemizedlist>
+        <listitem>
+          <para>[dnicholson] - Changed the Shadow download URL to a more
+          stable location.</para>
+        </listitem>
         <listitem>
           <para>[dnicholson] - Updated the acknowledgements page again.</para>
         </listitem>
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 899b8ca73..1516e6ed5 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -467,6 +467,7 @@
         <para>Download: <ulink url="&shadow-url;"/></para>
         <para>MD5 sum: <literal>&shadow-md5;</literal></para>
 
+        <!-- Using anduin for now since this site is dead
         <note>
           <para>Shadow (&shadow-version;) may no longer be available at the
           listed location. The site administrators of the master download
@@ -474,6 +475,7 @@
           url="ftp://ftp.pld.org.pl/software/shadow/old/"/> when new ones are
           released.</para>
         </note>
+        -->
       </listitem>
     </varlistentry>
 
diff --git a/general.ent b/general.ent
index 37fa5fd42..40d29b7e3 100644
--- a/general.ent
+++ b/general.ent
@@ -12,6 +12,7 @@
 <!ENTITY hints-index "&lfs-root;hints/list.html">
 <!ENTITY patches-root "&lfs-root;patches/lfs/&generic-version;/">
 <!ENTITY downloads-root "&lfs-root;lfs/downloads/&generic-version;/">
+<!ENTITY anduin-sources "http://anduin.linuxfromscratch.org/sources/LFS/lfs-packages/&generic-version;/">
 <!ENTITY livecd-root "&lfs-root;livecd/">
 <!ENTITY test-results "&lfs-root;lfs/build-logs/&generic-version;/">
 <!ENTITY errata "&lfs-root;lfs/errata/&generic-version;/">
diff --git a/packages.ent b/packages.ent
index c7b5731b4..389b61fdd 100644
--- a/packages.ent
+++ b/packages.ent
@@ -432,7 +432,10 @@
 
 <!ENTITY shadow-version "4.0.18.1">
 <!ENTITY shadow-size "1,481 KB">
+<!-- This site is dead. Use anduin instead.
 <!ENTITY shadow-url "ftp://ftp.pld.org.pl/software/shadow/shadow-&shadow-version;.tar.bz2">
+-->
+<!ENTITY shadow-url "&anduin-sources;shadow-&shadow-version;.tar.bz2">
 <!ENTITY shadow-md5 "e7751d46ecf219c07ae0b028ab3335c6">
 <!ENTITY shadow-home " ">
 <!ENTITY shadow-ch6-du "20.7 MB">