Index: x/lib/atk/atk-intro.xml
===================================================================
--- x/lib/atk/atk-intro.xml	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ x/lib/atk/atk-intro.xml	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -2,5 +2,6 @@
 <title>Introduction to ATK</title>
 
-<screen>Download location:              <ulink url="&ATK-download;"/>
+<screen>Download location (HTTP):       <ulink url="&ATK-download-http;"/>
+Download location (FTP):        <ulink url="&ATK-download-ftp;"/>
 Version used:                   &ATK-version;
 Package size:                   &ATK-size;
Index: x/lib/atk/atk.ent
===================================================================
--- x/lib/atk/atk.ent	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ x/lib/atk/atk.ent	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -6,4 +6,5 @@
 <!ENTITY ATK-buildsize "3 MB">
 <!ENTITY ATK-version "1.0.2">
-<!ENTITY ATK-download "ftp://ftp.gtk.org/pub/gtk/v2.0/atk-1.0.2.tar.gz">
+<!ENTITY ATK-download-http "">
+<!ENTITY ATK-download-ftp "ftp://ftp.gtk.org/pub/gtk/v2.0/atk-1.0.2.tar.gz">
 <!ENTITY ATK-size "340 KB">
Index: x/lib/gtk/gtk+-intro.xml
===================================================================
--- x/lib/gtk/gtk+-intro.xml	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ x/lib/gtk/gtk+-intro.xml	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -2,5 +2,6 @@
 <title>Introduction to GTK+</title>
 
-<screen>Download location:              <ulink url="&GTK-download;"/>
+<screen>Download location (HTTP):       <ulink url="&GTK-download-http;"/>
+Download location (FTP):        <ulink url="&GTK-download-ftp;"/>
 Version used:                   &GTK-version;
 Package size:                   &GTK-size;
Index: x/lib/gtk/gtk+2-intro.xml
===================================================================
--- x/lib/gtk/gtk+2-intro.xml	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ x/lib/gtk/gtk+2-intro.xml	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -2,5 +2,6 @@
 <title>Introduction to GTK+</title>
 
-<screen>Download location:              <ulink url="&GTK2-download;"/>
+<screen>Download location (HTTP):       <ulink url="&GTK2-download-http;"/>
+Download location (FTP):        <ulink url="&GTK2-download-ftp;"/>
 Version used:                   &GTK2-version;
 Package size:                   &GTK2-size;
Index: x/lib/gtk/gtk.ent
===================================================================
--- x/lib/gtk/gtk.ent	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ x/lib/gtk/gtk.ent	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -6,5 +6,6 @@
 <!ENTITY GTK-buildsize "54 MB">
 <!ENTITY GTK-version "1.2.10">
-<!ENTITY GTK-download "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz">
+<!ENTITY GTK-download-http "">
+<!ENTITY GTK-download-ftp "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-1.2.10.tar.gz">
 <!ENTITY GTK-size "2.7 MB">
 
@@ -16,4 +17,5 @@
 <!ENTITY GTK2-buildsize "62.4 MB">
 <!ENTITY GTK2-version "2.0.5">
-<!ENTITY GTK2-download "ftp://ftp.gtk.org/pub/gtk/v2.0/gtk+-2.0.5.tar.gz">
+<!ENTITY GTK2-download-http "">
+<!ENTITY GTK2-download-ftp "ftp://ftp.gtk.org/pub/gtk/v2.0/gtk+-2.0.5.tar.gz">
 <!ENTITY GTK2-size "8.2 MB">
Index: x/lib/pango/pango-intro.xml
===================================================================
--- x/lib/pango/pango-intro.xml	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ x/lib/pango/pango-intro.xml	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -2,5 +2,6 @@
 <title>Introduction to Pango</title>
 
-<screen>Download location:              <ulink url="&Pango-download;"/>
+<screen>Download location (HTTP):       <ulink url="&Pango-download-http;"/>
+Download location (FTP):        <ulink url="&Pango-download-ftp;"/>
 Version used:                   &Pango-version;
 Package size:                   &Pango-size;
Index: x/lib/pango/pango.ent
===================================================================
--- x/lib/pango/pango.ent	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ x/lib/pango/pango.ent	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -6,4 +6,5 @@
 <!ENTITY Pango-buildsize "10 MB">
 <!ENTITY Pango-version "1.0.3">
-<!ENTITY Pango-download "ftp://ftp.gtk.org/pub/gtk/v2.0/pango-1.0.3.tar.gz">
+<!ENTITY Pango-download-http "">
+<!ENTITY Pango-download-ftp "ftp://ftp.gtk.org/pub/gtk/v2.0/pango-1.0.3.tar.gz">
 <!ENTITY Pango-size "1.1 MB">
Index: x/lib/qt/qt-intro.xml
===================================================================
--- x/lib/qt/qt-intro.xml	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ x/lib/qt/qt-intro.xml	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -2,5 +2,6 @@
 <title>Introduction to qt</title>
 
-<screen>Download location:              <ulink url="&qt-download;"/>
+<screen>Download location (HTTP):       <ulink url="&qt-download-http;"/>
+Download location (FTP):        <ulink url="&qt-download-ftp;"/>
 Version used:                   &qt-version;
 Package size:                   &qt-size;
Index: x/lib/qt/qt.ent
===================================================================
--- x/lib/qt/qt.ent	(revision b9139e21657c6df260ad0ee47143be50a4b6cf0c)
+++ x/lib/qt/qt.ent	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -9,4 +9,5 @@
 <!ENTITY qt-buildsize "147 MB">
 <!ENTITY qt-version "3.0.4">
-<!ENTITY qt-download "ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.0.4.tar.gz">
+<!ENTITY qt-download-http "">
+<!ENTITY qt-download-ftp "ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.0.4.tar.gz">
 <!ENTITY qt-size "15 MB">
