Index: general/sysutils/fcron/fcron-intro.xml
===================================================================
--- general/sysutils/fcron/fcron-intro.xml	(revision 8c79730ed50f3ed64f91756735f4bc5343e47bd4)
+++ general/sysutils/fcron/fcron-intro.xml	(revision 94a16316bff9852f44c1f1171a7a0ddea9710ef5)
@@ -2,5 +2,6 @@
 <title>Introduction to fcron</title>
 
-<screen>Download location:              <ulink url="&fcron-download;"/>
+<screen>Download location (HTTP):       <ulink url="&fcron-download-http;"/>
+Download location (FTP):        <ulink url="&fcron-download-ftp;"/>
 Version used:                   &fcron-version;
 Package size:                   &fcron-size;
@@ -11,8 +12,8 @@
 Cron.&quot; </para>
 
-<screen>fcron requires a running syslog (part of the base LFS system).
-fcron recommends a local mail system (sendmail or <xref
-linkend="postfix"></xref>, for example).
-fcron will utilize PAM if it is installed prior to fcron.</screen>
+<screen>fcron recommends:
+local mail system (sendmail or <xref linkend="postfix"></xref>, for example).
+fcron utilizes:
+PAM if it is installed prior to fcron.</screen>
 
 </sect2>
Index: general/sysutils/fcron/fcron.ent
===================================================================
--- general/sysutils/fcron/fcron.ent	(revision 8c79730ed50f3ed64f91756735f4bc5343e47bd4)
+++ general/sysutils/fcron/fcron.ent	(revision 94a16316bff9852f44c1f1171a7a0ddea9710ef5)
@@ -7,4 +7,5 @@
 <!ENTITY fcron-buildsize "2.3 MB">
 <!ENTITY fcron-version "2.9.0">
-<!ENTITY fcron-download "http://fcron.free.fr/fcron-2.9.0.src.tar.gz">
+<!ENTITY fcron-download-http "http://fcron.free.fr/fcron-2.9.0.src.tar.gz">
+<!ENTITY fcron-download-ftp "">
 <!ENTITY fcron-size "324 KB">
Index: general/sysutils/gpm/gpm-intro.xml
===================================================================
--- general/sysutils/gpm/gpm-intro.xml	(revision 8c79730ed50f3ed64f91756735f4bc5343e47bd4)
+++ general/sysutils/gpm/gpm-intro.xml	(revision 94a16316bff9852f44c1f1171a7a0ddea9710ef5)
@@ -2,5 +2,6 @@
 <title>Introduction to gpm</title>
 
-<screen>Download location:              &gpm-download;
+<screen>Download location (HTTP):       <ulink url="&gpm-download-http;"/>
+Download location (FTP):        <ulink url="&gpm-download-ftp;"/>
 Version used:                   &gpm-version;
 Package size:                   &gpm-size;
Index: general/sysutils/gpm/gpm.ent
===================================================================
--- general/sysutils/gpm/gpm.ent	(revision 8c79730ed50f3ed64f91756735f4bc5343e47bd4)
+++ general/sysutils/gpm/gpm.ent	(revision 94a16316bff9852f44c1f1171a7a0ddea9710ef5)
@@ -6,4 +6,5 @@
 <!ENTITY gpm-buildsize "3.2 MB">
 <!ENTITY gpm-version "1.20.0">
-<!ENTITY gpm-download "ftp://arcana.linux.it/pub/gpm/gpm-1.20.0.tar.bz2">
+<!ENTITY gpm-download-http "">
+<!ENTITY gpm-download-ftp "ftp://arcana.linux.it/pub/gpm/gpm-1.20.0.tar.bz2">
 <!ENTITY gpm-size "382 KB">
Index: general/sysutils/hdparm/hdparm-intro.xml
===================================================================
--- general/sysutils/hdparm/hdparm-intro.xml	(revision 8c79730ed50f3ed64f91756735f4bc5343e47bd4)
+++ general/sysutils/hdparm/hdparm-intro.xml	(revision 94a16316bff9852f44c1f1171a7a0ddea9710ef5)
@@ -2,5 +2,6 @@
 <title>Introduction to hdparm</title>
 
-<screen>Download location:              &hdparm-download;
+<screen>Download location (HTTP):       <ulink url="&hdparm-download-http;"/>
+Download location (FTP):        <ulink url="&hdparm-download-ftp;"/>
 Version used:                   &hdparm-version;
 Package size:                   &hdparm-size;
Index: general/sysutils/hdparm/hdparm.ent
===================================================================
--- general/sysutils/hdparm/hdparm.ent	(revision 8c79730ed50f3ed64f91756735f4bc5343e47bd4)
+++ general/sysutils/hdparm/hdparm.ent	(revision 94a16316bff9852f44c1f1171a7a0ddea9710ef5)
@@ -5,4 +5,5 @@
 <!ENTITY hdparm-buildsize "257 KB">
 <!ENTITY hdparm-version "5.2">
-<!ENTITY hdparm-download "ftp://ftp.ibiblio.org/pub/Linux/system/hardware/hdparm-5.2.tar.gz">
+<!ENTITY hdparm-download-http "">
+<!ENTITY hdparm-download-ftp "ftp://ftp.ibiblio.org/pub/Linux/system/hardware/hdparm-5.2.tar.gz">
 <!ENTITY hdparm-size "36 KB">
Index: general/sysutils/pkgconfig/pkgconfig-intro.xml
===================================================================
--- general/sysutils/pkgconfig/pkgconfig-intro.xml	(revision 8c79730ed50f3ed64f91756735f4bc5343e47bd4)
+++ general/sysutils/pkgconfig/pkgconfig-intro.xml	(revision 94a16316bff9852f44c1f1171a7a0ddea9710ef5)
@@ -2,5 +2,6 @@
 <title>Introduction to pkgconfig</title>
 
-<screen>Download location:              <ulink url="&pkgconfig-download;"/>
+<screen>Download location (HTTP):       <ulink url="&pkgconfig-download-http;"/>
+Download location (FTP):        <ulink url="&pkgconfig-download-ftp;"/>
 Version used:                   &pkgconfig-version;
 Package size:                   &pkgconfig-size;
Index: general/sysutils/pkgconfig/pkgconfig.ent
===================================================================
--- general/sysutils/pkgconfig/pkgconfig.ent	(revision 8c79730ed50f3ed64f91756735f4bc5343e47bd4)
+++ general/sysutils/pkgconfig/pkgconfig.ent	(revision 94a16316bff9852f44c1f1171a7a0ddea9710ef5)
@@ -5,4 +5,5 @@
 <!ENTITY pkgconfig-buildsize "5 MB">
 <!ENTITY pkgconfig-version "0.12.0">
-<!ENTITY pkgconfig-download "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.12.0.tar.gz">
+<!ENTITY pkgconfig-download-http "http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.12.0.tar.gz">
+<!ENTITY pkgconfig-download-ftp "">
 <!ENTITY pkgconfig-size "596 KB">
Index: general/sysutils/which/which-intro.xml
===================================================================
--- general/sysutils/which/which-intro.xml	(revision 8c79730ed50f3ed64f91756735f4bc5343e47bd4)
+++ general/sysutils/which/which-intro.xml	(revision 94a16316bff9852f44c1f1171a7a0ddea9710ef5)
@@ -2,5 +2,6 @@
 <title>Introduction to which</title>
 
-<screen>Download location:              &which-download;
+<screen>Download location (HTTP):       <ulink url="&which-download-http;"/>
+Download location (FTP):        <ulink url="&which-download-ftp;"/>
 Version used:                   &which-version;
 Package size:                   &which-size;
Index: general/sysutils/which/which.ent
===================================================================
--- general/sysutils/which/which.ent	(revision 8c79730ed50f3ed64f91756735f4bc5343e47bd4)
+++ general/sysutils/which/which.ent	(revision 94a16316bff9852f44c1f1171a7a0ddea9710ef5)
@@ -5,4 +5,5 @@
 <!ENTITY which-buildsize "667 KB">
 <!ENTITY which-version "2.13">
-<!ENTITY which-download "ftp://ftp.gnu.org/pub/gnu/which/which-2.13.tar.gz">
+<!ENTITY which-download-http "">
+<!ENTITY which-download-ftp "ftp://ftp.gnu.org/pub/gnu/which/which-2.13.tar.gz">
 <!ENTITY which-size "104 KB">
