diff --git a/general.ent b/general.ent
index 435980f49..00644bb13 100644
--- a/general.ent
+++ b/general.ent
@@ -1,35 +1,38 @@
-<!ENTITY version "SVN-20130501">
-<!ENTITY releasedate "May 1, 2013">
-<!ENTITY copyrightdate "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
-<!ENTITY milestone "7.4">
+<!ENTITY version         "SVN-20130501">
+<!ENTITY releasedate     "May 1, 2013">
+<!ENTITY copyrightdate   "1999-2013"><!-- jhalfs needs a literal dash, not &ndash; -->
+<!ENTITY milestone       "7.4">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 
-<!ENTITY lfs-root "http://www.linuxfromscratch.org/">
+<!ENTITY lfs-root        "http://www.linuxfromscratch.org/">
+<!ENTITY blfs-root       "&lfs-root;blfs/">
+<!ENTITY faq-root        "&lfs-root;faq/">
+<!ENTITY hints-root      "&lfs-root;hints/downloads/files/">
+<!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 livecd-root     "&lfs-root;livecd/">
+<!ENTITY test-results    "&lfs-root;lfs/build-logs/&generic-version;/">
+<!ENTITY errata          "&lfs-root;lfs/errata/&generic-version;/">
+                         
 <!ENTITY lfs-ticket-root "http://wiki.linuxfromscratch.org/lfs/ticket/">
-<!ENTITY blfs-root "&lfs-root;blfs/">
-<!ENTITY faq-root "&lfs-root;faq/">
-<!ENTITY hints-root "&lfs-root;hints/downloads/files/">
-<!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/conglomeration/">
-<!ENTITY anduin-other "http://anduin.linuxfromscratch.org/sources/other/">
-<!ENTITY livecd-root "&lfs-root;livecd/">
-<!ENTITY test-results "&lfs-root;lfs/build-logs/&generic-version;/">
-<!ENTITY errata "&lfs-root;lfs/errata/&generic-version;/">
 
-<!ENTITY buildtime "Approximate build time">
-<!ENTITY diskspace "Required disk space">
-<!ENTITY dependencies "Installation depends on">
-<!ENTITY testsuites "Test suite depends on">
-<!ENTITY before "Must be installed before">
-<!ENTITY external "Optional dependencies">
+<!ENTITY anduin          "http://anduin.linuxfromscratch.org/sources">
+<!ENTITY anduin-sources  "&anduin;/LFS/lfs-packages/conglomeration/">
+<!ENTITY anduin-other    "&anduin;/other/">
 
-<!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/">
+<!ENTITY buildtime       "Approximate build time">
+<!ENTITY diskspace       "Required disk space">
+<!ENTITY dependencies    "Installation depends on">
+<!ENTITY testsuites      "Test suite depends on">
+<!ENTITY before          "Must be installed before">
+<!ENTITY external        "Optional dependencies">
+                         
+<!ENTITY gnu             "http://ftp.gnu.org/gnu/">
+<!ENTITY gnu-software    "http://www.gnu.org/software/">
+<!ENTITY alpha-gnu       "http://alpha.gnu.org/gnu/">
+<!ENTITY kernel          "http://www.kernel.org/pub/">
+<!ENTITY sourceforge     "http://prdownloads.sourceforge.net/">
 
 <!ENTITY % packages-entities SYSTEM "packages.ent">
 %packages-entities;
diff --git a/packages.ent b/packages.ent
index c7cc2646e..65b4d2bc9 100644
--- a/packages.ent
+++ b/packages.ent
@@ -415,7 +415,7 @@
 
 <!ENTITY ncurses-version "5.9">
 <!ENTITY ncurses-size "2,760 KB">
-<!ENTITY ncurses-url "ftp://ftp.gnu.org/gnu/ncurses/ncurses-&ncurses-version;.tar.gz">
+<!ENTITY ncurses-url "http://ftp.gnu.org/gnu/ncurses/ncurses-&ncurses-version;.tar.gz">
 <!ENTITY ncurses-md5 "8cb9c412e5f2d96bc6f459aa8c6282a1">
 <!ENTITY ncurses-home "http://www.gnu.org/software/ncurses/">
 <!ENTITY ncurses-ch5-du "35 MB">