diff --git a/general/genutils/bc/bc.ent b/general/genutils/bc/bc.ent
index 44c8b3e234..9cdadcd4ed 100644
--- a/general/genutils/bc/bc.ent
+++ b/general/genutils/bc/bc.ent
@@ -1,12 +1,10 @@
 <!ENTITY bc SYSTEM "../bc.xml">
 <!ENTITY bc-intro SYSTEM "bc-intro.xml">
 <!ENTITY bc-inst SYSTEM "bc-inst.xml">
-<!ENTITY bc-exp SYSTEM "bc-exp.xml">
 <!ENTITY bc-desc SYSTEM "bc-desc.xml">
-<!ENTITY bc-config SYSTEM "bc-config.xml">
-<!ENTITY bc-buildsize "1.6 MB">
 <!ENTITY bc-version "1.06">
-<!ENTITY bc-download-http "http://ftp.gnu.org/gnu/bc/bc-1.06.tar.gz">
-<!ENTITY bc-download-ftp "ftp://ftp.gnu.org/gnu/bc/bc-1.06.tar.gz">
+<!ENTITY bc-download-http "http://ftp.gnu.org/gnu/bc/bc-&bc-version;.tar.gz">
+<!ENTITY bc-download-ftp "ftp://ftp.gnu.org/gnu/bc/bc-&bc-version;.tar.gz">
 <!ENTITY bc-size "280 KB">
+<!ENTITY bc-buildsize "1.6 MB">
 <!ENTITY bc-time "0.07 SBU">
diff --git a/general/genutils/compface/compface.ent b/general/genutils/compface/compface.ent
index 654eabd07f..11780115de 100644
--- a/general/genutils/compface/compface.ent
+++ b/general/genutils/compface/compface.ent
@@ -1,13 +1,10 @@
 <!ENTITY compface SYSTEM "../compface.xml">
 <!ENTITY compface-intro SYSTEM "compface-intro.xml">
 <!ENTITY compface-inst SYSTEM "compface-inst.xml">
-<!ENTITY compface-exp SYSTEM "compface-exp.xml">
 <!ENTITY compface-desc SYSTEM "compface-desc.xml">
-<!ENTITY compface-config SYSTEM "compface-config.xml">
-<!ENTITY compface-buildsize "520 KB">
 <!ENTITY compface-version "1.4">
-<!ENTITY compface-download-http
-"http://www.ibiblio.org/pub/Linux/apps/graphics/convert/compface-&compface-version;.tar.gz">
-<!ENTITY compface-download-ftp "">
+<!ENTITY compface-download-http "http://www.ibiblio.org/pub/Linux/apps/graphics/convert/compface-&compface-version;.tar.gz">
+<!ENTITY compface-download-ftp "ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/convert/compface-&compface-version;.tar.gz">
 <!ENTITY compface-size "28 KB">
+<!ENTITY compface-buildsize "520 KB">
 <!ENTITY compface-time "0.01 SBU">
diff --git a/general/genutils/rep-gtk/rep-gtk.ent b/general/genutils/rep-gtk/rep-gtk.ent
index 191a62e393..0695fe1aab 100644
--- a/general/genutils/rep-gtk/rep-gtk.ent
+++ b/general/genutils/rep-gtk/rep-gtk.ent
@@ -1,12 +1,10 @@
 <!ENTITY rep-gtk SYSTEM "../rep-gtk.xml">
 <!ENTITY rep-gtk-intro SYSTEM "rep-gtk-intro.xml">
 <!ENTITY rep-gtk-inst SYSTEM "rep-gtk-inst.xml">
-<!ENTITY rep-gtk-exp SYSTEM "rep-gtk-exp.xml">
 <!ENTITY rep-gtk-desc SYSTEM "rep-gtk-desc.xml">
-<!ENTITY rep-gtk-config SYSTEM "rep-gtk-config.xml">
-<!ENTITY rep-gtk-buildsize "7.7 MB">
 <!ENTITY rep-gtk-version "0.18">
-<!ENTITY rep-gtk-download-http "http://telia.dl.sourceforge.net/sourceforge/rep-gtk/rep-gtk-0.18.tar.gz">
+<!ENTITY rep-gtk-download-http "http://telia.dl.sourceforge.net/sourceforge/rep-gtk/rep-gtk-&rep-gtk-version;.tar.gz">
 <!ENTITY rep-gtk-download-ftp "">
 <!ENTITY rep-gtk-size "152 KB">
+<!ENTITY rep-gtk-buildsize "7.7 MB">
 <!ENTITY rep-gtk-time "0.18 SBU">
diff --git a/general/sysutils/cpio/cpio.ent b/general/sysutils/cpio/cpio.ent
index 7dfe225bcc..097ad66807 100644
--- a/general/sysutils/cpio/cpio.ent
+++ b/general/sysutils/cpio/cpio.ent
@@ -3,10 +3,9 @@
 <!ENTITY cpio-inst SYSTEM "cpio-inst.xml">
 <!ENTITY cpio-exp SYSTEM "cpio-exp.xml">
 <!ENTITY cpio-desc SYSTEM "cpio-desc.xml">
-<!ENTITY cpio-config SYSTEM "cpio-config.xml">
-<!ENTITY cpio-buildsize "1 MB">
 <!ENTITY cpio-version "2.5">
-<!ENTITY cpio-download-http "http://ftp.gnu.org/pub/gnu/cpio/cpio-2.5.tar.gz">
-<!ENTITY cpio-download-ftp "ftp://ftp.gnu.org/pub/gnu/cpio/cpio-2.5.tar.gz">
+<!ENTITY cpio-download-http "http://ftp.gnu.org/pub/gnu/cpio/cpio-&cpio-version;.tar.gz">
+<!ENTITY cpio-download-ftp "ftp://ftp.gnu.org/pub/gnu/cpio/cpio-&cpio-version;.tar.gz">
 <!ENTITY cpio-size "188 KB">
+<!ENTITY cpio-buildsize "1 MB">
 <!ENTITY cpio-time "0.06 SBU">
diff --git a/general/sysutils/fcron/fcron.ent b/general/sysutils/fcron/fcron.ent
index 6d3015252b..417421cd26 100644
--- a/general/sysutils/fcron/fcron.ent
+++ b/general/sysutils/fcron/fcron.ent
@@ -2,11 +2,11 @@
 <!ENTITY fcron-intro SYSTEM "fcron-intro.xml">
 <!ENTITY fcron-inst SYSTEM "fcron-inst.xml">
 <!ENTITY fcron-exp SYSTEM "fcron-exp.xml">
-<!ENTITY fcron-desc SYSTEM "fcron-desc.xml">
 <!ENTITY fcron-config SYSTEM "fcron-config.xml">
-<!ENTITY fcron-buildsize "3.3 MB">
+<!ENTITY fcron-desc SYSTEM "fcron-desc.xml">
 <!ENTITY fcron-version "2.9.3">
 <!ENTITY fcron-download-http "http://fcron.free.fr/fcron-&fcron-version;.src.tar.gz">
 <!ENTITY fcron-download-ftp "ftp://ftp.seul.org/pub/fcron/fcron-&fcron-version;.src.tar.gz">
 <!ENTITY fcron-size "365 KB">
+<!ENTITY fcron-buildsize "3.3 MB">
 <!ENTITY fcron-time "0.11 SBU">
diff --git a/general/sysutils/gpm/gpm.ent b/general/sysutils/gpm/gpm.ent
index e34811c5d7..fbc5a883ad 100644
--- a/general/sysutils/gpm/gpm.ent
+++ b/general/sysutils/gpm/gpm.ent
@@ -1,11 +1,11 @@
 <!ENTITY gpm SYSTEM "../gpm.xml">
 <!ENTITY gpm-intro SYSTEM "gpm-intro.xml">
 <!ENTITY gpm-inst SYSTEM "gpm-inst.xml">
-<!ENTITY gpm-desc SYSTEM "gpm-desc.xml">
 <!ENTITY gpm-config SYSTEM "gpm-config.xml">
-<!ENTITY gpm-buildsize "5.3 MB">
+<!ENTITY gpm-desc SYSTEM "gpm-desc.xml">
 <!ENTITY gpm-version "1.20.1">
 <!ENTITY gpm-download-http "">
 <!ENTITY gpm-download-ftp "ftp://arcana.linux.it/pub/gpm/gpm-&gpm-version;.tar.bz2">
 <!ENTITY gpm-size "556 KB">
+<!ENTITY gpm-buildsize "5.3 MB">
 <!ENTITY gpm-time "0.09 SBU">
diff --git a/general/sysutils/hdparm/hdparm.ent b/general/sysutils/hdparm/hdparm.ent
index 5e4fb62427..ab03f5ed30 100644
--- a/general/sysutils/hdparm/hdparm.ent
+++ b/general/sysutils/hdparm/hdparm.ent
@@ -1,11 +1,11 @@
 <!ENTITY hdparm SYSTEM "../hdparm.xml">
 <!ENTITY hdparm-intro SYSTEM "hdparm-intro.xml">
 <!ENTITY hdparm-inst SYSTEM "hdparm-inst.xml">
-<!ENTITY hdparm-desc SYSTEM "hdparm-desc.xml">
 <!ENTITY hdparm-config SYSTEM "hdparm-config.xml">
-<!ENTITY hdparm-buildsize "257 KB">
+<!ENTITY hdparm-desc SYSTEM "hdparm-desc.xml">
 <!ENTITY hdparm-version "5.4">
 <!ENTITY hdparm-download-http "http://www.ibiblio.org/pub/Linux/system/hardware/hdparm-&hdparm-version;.tar.gz">
 <!ENTITY hdparm-download-ftp "ftp://ftp.ibiblio.org/pub/Linux/system/hardware/hdparm-&hdparm-version;.tar.gz">
 <!ENTITY hdparm-size "33 KB">
+<!ENTITY hdparm-buildsize "257 KB">
 <!ENTITY hdparm-time "0.01 SBU">
diff --git a/general/sysutils/mc/mc.ent b/general/sysutils/mc/mc.ent
index 4684bf1ad5..17b9a94990 100644
--- a/general/sysutils/mc/mc.ent
+++ b/general/sysutils/mc/mc.ent
@@ -1,12 +1,11 @@
 <!ENTITY mc SYSTEM "../mc.xml">
 <!ENTITY mc-intro SYSTEM "mc-intro.xml">
 <!ENTITY mc-inst SYSTEM "mc-inst.xml">
-<!ENTITY mc-exp SYSTEM "mc-exp.xml">
 <!ENTITY mc-config SYSTEM "mc-config.xml">
 <!ENTITY mc-desc SYSTEM "mc-desc.xml">
 <!ENTITY mc-version "4.6.0">
 <!ENTITY mc-download-http "http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/mc-&mc-version;.tar.gz">
-<!ENTITY mc-download-ftp "">
+<!ENTITY mc-download-ftp "ftp://ftp.uni-koeln.de/util/shell/mc-&mc-version;.tar.gz">
 <!ENTITY mc-size "3.6 MB">
 <!ENTITY mc-buildsize "31 MB">
 <!ENTITY mc-time "0.45 SBU">
diff --git a/general/sysutils/pciutils/pciutils.ent b/general/sysutils/pciutils/pciutils.ent
index 7c2bb81c23..2493b77637 100644
--- a/general/sysutils/pciutils/pciutils.ent
+++ b/general/sysutils/pciutils/pciutils.ent
@@ -1,14 +1,10 @@
 <!ENTITY pciutils SYSTEM "../pciutils.xml">
 <!ENTITY pciutils-intro SYSTEM "pciutils-intro.xml">
 <!ENTITY pciutils-inst SYSTEM "pciutils-inst.xml">
-<!ENTITY pciutils-exp SYSTEM "pciutils-exp.xml">
 <!ENTITY pciutils-desc SYSTEM "pciutils-desc.xml">
-<!ENTITY pciutils-config SYSTEM "pciutils-config.xml">
-<!ENTITY pciutils-buildsize "1.1 MB">
 <!ENTITY pciutils-version "2.1.11">
-<!ENTITY pciutils-download-http
-"http://www.kernel.org/pub/software/utils/pciutils/pciutils-&pciutils-version;.tar.bz2">
-<!ENTITY pciutils-download-ftp
-"ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-&pciutils-version;.tar.bz2">
+<!ENTITY pciutils-download-http "http://www.kernel.org/pub/software/utils/pciutils/pciutils-&pciutils-version;.tar.bz2">
+<!ENTITY pciutils-download-ftp "ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-&pciutils-version;.tar.bz2">
 <!ENTITY pciutils-size "107 KB">
+<!ENTITY pciutils-buildsize "1.1 MB">
 <!ENTITY pciutils-time "0.02 SBU">
diff --git a/general/sysutils/pkgconfig/pkgconfig.ent b/general/sysutils/pkgconfig/pkgconfig.ent
index 95cb6f2873..8f01ffe042 100644
--- a/general/sysutils/pkgconfig/pkgconfig.ent
+++ b/general/sysutils/pkgconfig/pkgconfig.ent
@@ -3,9 +3,9 @@
 <!ENTITY pkgconfig-inst SYSTEM "pkgconfig-inst.xml">
 <!ENTITY pkgconfig-config SYSTEM "pkgconfig-config.xml">
 <!ENTITY pkgconfig-desc SYSTEM "pkgconfig-desc.xml">
-<!ENTITY pkgconfig-buildsize "5.2 MB">
 <!ENTITY pkgconfig-version "0.15.0">
-<!ENTITY pkgconfig-download-http "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.15.0.tar.gz">
-<!ENTITY pkgconfig-download-ftp "">
+<!ENTITY pkgconfig-download-http "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-&pkgconfig-version;.tar.gz">
+<!ENTITY pkgconfig-download-ftp "ftp://ftp.netbuddy.org/linux/pkgconfig-&pkgconfig-version;.tar.gz">
 <!ENTITY pkgconfig-size "604 KB">
+<!ENTITY pkgconfig-buildsize "5.2 MB">
 <!ENTITY pkgconfig-time "0.22 SBU">
diff --git a/general/sysutils/which/which.ent b/general/sysutils/which/which.ent
index fb74cef38e..a8999eb158 100644
--- a/general/sysutils/which/which.ent
+++ b/general/sysutils/which/which.ent
@@ -2,9 +2,9 @@
 <!ENTITY which-intro SYSTEM "which-intro.xml">
 <!ENTITY which-inst SYSTEM "which-inst.xml">
 <!ENTITY which-desc SYSTEM "which-desc.xml">
-<!ENTITY which-buildsize "719 KB">
 <!ENTITY which-version "2.14">
-<!ENTITY which-download-http "http://ftp.gnu.org/gnu/which/which-2.14.tar.gz">
-<!ENTITY which-download-ftp "ftp://ftp.gnu.org/gnu/which/which-2.14.tar.gz">
+<!ENTITY which-download-http "http://ftp.gnu.org/gnu/which/which-&which-version;.tar.gz">
+<!ENTITY which-download-ftp "ftp://ftp.gnu.org/gnu/which/which-&which-version;.tar.gz">
 <!ENTITY which-size "110 KB">
+<!ENTITY which-buildsize "719 KB">
 <!ENTITY which-time "0.01 SBU">