diff --git a/general.ent b/general.ent
index 908dfea22..8059a97e6 100644
--- a/general.ent
+++ b/general.ent
@@ -12,7 +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 anduin-sources "http://anduin.linuxfromscratch.org/sources/LFS/lfs-packages/conglomeration/">
 <!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 da7189184..90848301a 100644
--- a/packages.ent
+++ b/packages.ent
@@ -251,9 +251,9 @@
 
 <!ENTITY iana-etc-version "2.30">
 <!ENTITY iana-etc-size "201 KB">
-<!ENTITY iana-etc-url "http://sethwklein.net/iana-etc-&iana-etc-version;.tar.bz2">
+<!ENTITY iana-etc-url "&anduin-sources;/iana-etc/iana-etc-&iana-etc-version;.tar.bz2">
 <!ENTITY iana-etc-md5 "3ba3afb1d1b261383d247f46cb135ee8">
-<!ENTITY iana-etc-home "http://sethwklein.net/iana-etc">
+<!ENTITY iana-etc-home "http://freshmeat.net/projects/iana-etc/">
 <!ENTITY iana-etc-ch6-du "2.3 MB">
 <!ENTITY iana-etc-ch6-sbu "less than 0.1 SBU">