Index: gnome/lib/gdk/gdk-intro.xml
===================================================================
--- gnome/lib/gdk/gdk-intro.xml	(revision 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ gnome/lib/gdk/gdk-intro.xml	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -2,5 +2,6 @@
 <title>Introduction to gdk-pixbuf</title>
 
-<screen>Download location:              <ulink url="&gdk-download;"/>
+<screen>Download location (HTTP):       <ulink url="&gdk-download-http;"/>
+Download location (FTP):        <ulink url="&gdk-download-ftp;"/>
 Version used:                   &gdk-version;
 Package size:                   &gdk-size;
Index: gnome/lib/gdk/gdk.ent
===================================================================
--- gnome/lib/gdk/gdk.ent	(revision 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ gnome/lib/gdk/gdk.ent	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -6,4 +6,5 @@
 <!ENTITY gdk-buildsize "12 MB">
 <!ENTITY gdk-version "0.11.0">
-<!ENTITY gdk-download "ftp://ftp.gnome.org/ftp/mirror/gnome.org/stable/latest/sources/gdk-pixbuf-0.11.0.tar.gz">
+<!ENTITY gdk-download-http "">
+<!ENTITY gdk-download-ftp "ftp://ftp.gnome.org/ftp/mirror/gnome.org/stable/latest/sources/gdk-pixbuf-0.11.0.tar.gz">
 <!ENTITY gdk-size "449 KB">
Index: multimedia/audioutils/cdparanoia/CDParanoia-intro.xml
===================================================================
--- multimedia/audioutils/cdparanoia/CDParanoia-intro.xml	(revision 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ multimedia/audioutils/cdparanoia/CDParanoia-intro.xml	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -2,5 +2,6 @@
 <title>Introduction to CDParanoia</title>
 
-<screen>Download location:              &CDParanoia-download;
+<screen>Download location (HTTP):       <ulink url="&CDParanoia-download-http;"/>
+Download location (FTP):        <ulink url="&CDParanoia-download-ftp;"/>
 Version used:                   &CDParanoia-version;
 Package size:                   &CDParanoia-size;
Index: multimedia/audioutils/cdparanoia/cdparanoia.ent
===================================================================
--- multimedia/audioutils/cdparanoia/cdparanoia.ent	(revision 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ multimedia/audioutils/cdparanoia/cdparanoia.ent	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -6,4 +6,5 @@
 <!ENTITY CDParanoia-buildsize "1.3 MB">
 <!ENTITY CDParanoia-version "III-9.8">
-<!ENTITY CDParanoia-download "http://www.xiph.org/paranoia/download/cdparanoia-III-alpha9.8.src.tgz">
+<!ENTITY CDParanoia-download-http "http://www.xiph.org/paranoia/download/cdparanoia-III-alpha9.8.src.tgz">
+<!ENTITY CDParanoia-download-ftp "">
 <!ENTITY CDParanoia-size "114 KB">
Index: multimedia/audioutils/mpg123/mpg123-intro.xml
===================================================================
--- multimedia/audioutils/mpg123/mpg123-intro.xml	(revision 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ multimedia/audioutils/mpg123/mpg123-intro.xml	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -2,5 +2,6 @@
 <title>Introduction to mpg123</title>
 
-<screen>Download location:              &mpg123-download;
+<screen>Download location (HTTP):       <ulink url="&mpg123-download-http;"/>
+Download location (FTP):        <ulink url="&mpg123-download-ftp;"/>
 Version used:                   &mpg123-version;
 Package size:                   &mpg123-size;
Index: multimedia/audioutils/mpg123/mpg123.ent
===================================================================
--- multimedia/audioutils/mpg123/mpg123.ent	(revision 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ multimedia/audioutils/mpg123/mpg123.ent	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -6,4 +6,5 @@
 <!ENTITY mpg123-buildsize "1.3 MB">
 <!ENTITY mpg123-version "0.59r">
-<!ENTITY mpg123-download "http://www.mpg123.de/mpg123/mpg123-0.59r.tar.gz">
+<!ENTITY mpg123-download-http "http://www.mpg123.de/mpg123/mpg123-0.59r.tar.gz">
+<!ENTITY mpg123-download-ftp "">
 <!ENTITY mpg123-size "155 KB">
Index: multimedia/cdwriteutils/cdrdao/cdrdao-intro.xml
===================================================================
--- multimedia/cdwriteutils/cdrdao/cdrdao-intro.xml	(revision 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ multimedia/cdwriteutils/cdrdao/cdrdao-intro.xml	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -2,5 +2,6 @@
 <title>Introduction to cdrdao</title>
 
-<screen>Download location:              <ulink url="&cdrdao-download;"/>
+<screen>Download location (HTTP):       <ulink url="&cdrdao-download-http;"/>
+Download location (FTP):        <ulink url="&cdrdao-download-ftp;"/>
 Version used:                   &cdrdao-version;
 Package size:                   &cdrdao-size;
Index: multimedia/cdwriteutils/cdrdao/cdrdao.ent
===================================================================
--- multimedia/cdwriteutils/cdrdao/cdrdao.ent	(revision 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ multimedia/cdwriteutils/cdrdao/cdrdao.ent	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -5,4 +5,5 @@
 <!ENTITY cdrdao-buildsize "15.9 MB">
 <!ENTITY cdrdao-version "1.1.5">
-<!ENTITY cdrdao-download "http://sourceforge.net/projects/cdrdao">
+<!ENTITY cdrdao-download-http "http://sourceforge.net/projects/cdrdao">
+<!ENTITY cdrdao-download-ftp "">
 <!ENTITY cdrdao-size "852 KB">
Index: multimedia/cdwriteutils/cdrtools/cdrtools-intro.xml
===================================================================
--- multimedia/cdwriteutils/cdrtools/cdrtools-intro.xml	(revision 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ multimedia/cdwriteutils/cdrtools/cdrtools-intro.xml	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -2,5 +2,6 @@
 <title>Introduction to cdrtools</title>
 
-<screen>Download location (FTP):        <ulink url="&cdrtools-download-ftp;"/>
+<screen>Download location (HTTP):       <ulink url="&cdrtools-download-http;"/>
+Download location (FTP):        <ulink url="&cdrtools-download-ftp;"/>
 Version used:                   &cdrtools-version;
 Package size:                   &cdrtools-size;
Index: multimedia/cdwriteutils/cdrtools/cdrtools.ent
===================================================================
--- multimedia/cdwriteutils/cdrtools/cdrtools.ent	(revision 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ multimedia/cdwriteutils/cdrtools/cdrtools.ent	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -6,4 +6,5 @@
 <!ENTITY cdrtools-buildsize "12.3 MB">
 <!ENTITY cdrtools-version "1.10">
+<!ENTITY cdrtools-download-http "">
 <!ENTITY cdrtools-download-ftp "ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/cdrtools-1.10.tar.gz">
 <!ENTITY cdrtools-size "1.27 MB">
Index: multimedia/libdriv/alsa/alsa-intro.xml
===================================================================
--- multimedia/libdriv/alsa/alsa-intro.xml	(revision 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ multimedia/libdriv/alsa/alsa-intro.xml	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -2,5 +2,6 @@
 <title>Introduction to alsa</title>
 
-<screen>Download location:              &alsa-download;
+<screen>Download location (HTTP):       <ulink url="&alsa-download-http;"/>
+Download location (FTP):        <ulink url="&alsa-download-ftp;"/>
 Version used:                   &alsa-version;
 Package size:                   &alsa-size;
Index: multimedia/libdriv/alsa/alsa.ent
===================================================================
--- multimedia/libdriv/alsa/alsa.ent	(revision 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ multimedia/libdriv/alsa/alsa.ent	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -7,4 +7,5 @@
 <!ENTITY alsa-buildsize "4-6MB (depending on chosen drivers)">
 <!ENTITY alsa-version "0.5.12a/0.9.0rc2">
-<!ENTITY alsa-download "http://www.alsa-project.org">
+<!ENTITY alsa-download-http "http://www.alsa-project.org">
+<!ENTITY alsa-download-ftp "">
 <!ENTITY alsa-size "400-600k (depending on version)">
Index: multimedia/libdriv/audiofile/audiofile-intro.xml
===================================================================
--- multimedia/libdriv/audiofile/audiofile-intro.xml	(revision 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ multimedia/libdriv/audiofile/audiofile-intro.xml	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -2,5 +2,6 @@
 <title>Introduction to audiofile</title>
 
-<screen>Download location:              &audiofile-download;
+<screen>Download location (HTTP):       <ulink url="&audiofile-download-http;"/>
+Download location (FTP):        <ulink url="&audiofile-download-ftp;"/>
 Version used:                   &audiofile-version;
 Package size:                   &audiofile-size;
Index: multimedia/libdriv/audiofile/audiofile.ent
===================================================================
--- multimedia/libdriv/audiofile/audiofile.ent	(revision 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ multimedia/libdriv/audiofile/audiofile.ent	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -6,4 +6,5 @@
 <!ENTITY audiofile-buildsize "17 MB">
 <!ENTITY audiofile-version "0.2.3">
-<!ENTITY audiofile-download "ftp://ftp.68k.org/pub/michael/audiofile-0.2.3.tar.gz">
+<!ENTITY audiofile-download-http "">
+<!ENTITY audiofile-download-ftp "ftp://ftp.68k.org/pub/michael/audiofile-0.2.3.tar.gz">
 <!ENTITY audiofile-size "332 KB">
Index: multimedia/libdriv/sdl/SDL-intro.xml
===================================================================
--- multimedia/libdriv/sdl/SDL-intro.xml	(revision 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ multimedia/libdriv/sdl/SDL-intro.xml	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -2,5 +2,6 @@
 <title>Introduction to SDL</title>
 
-<screen>Download location:              &SDL-download;
+<screen>Download location (HTTP):       <ulink url="&SDL-download-http;"/>
+Download location (FTP):        <ulink url="&SDL-download-ftp;"/>
 Version used:                   &SDL-version;
 Package size:                   &SDL-size;
Index: multimedia/libdriv/sdl/sdl.ent
===================================================================
--- multimedia/libdriv/sdl/sdl.ent	(revision 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ multimedia/libdriv/sdl/sdl.ent	(revision 4da6c87e92110b8027e224ccc9174a25da26de0d)
@@ -7,4 +7,5 @@
 <!ENTITY SDL-buildsize "12 MB">
 <!ENTITY SDL-version "1.2.4">
-<!ENTITY SDL-download "http://www.libsdl.org/release/SDL-1.2.4.tar.gz">
+<!ENTITY SDL-download-http "http://www.libsdl.org/release/SDL-1.2.4.tar.gz">
+<!ENTITY SDL-download-ftp "">
 <!ENTITY SDL-size "1.7 MB">
Index: x/lib/atk/atk-intro.xml
===================================================================
--- x/lib/atk/atk-intro.xml	(revision 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ 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 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ 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 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ 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 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ 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 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ 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 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ 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 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ 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 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ 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 31bab1442c6ad07a89eb78cd7bc623a225b43824)
+++ 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">
