Index: basicnet/netlibs/libpcap.xml
===================================================================
--- basicnet/netlibs/libpcap.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ basicnet/netlibs/libpcap.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY libpcap-download-http "http://www.tcpdump.org/release/libpcap-&libpcap-version;.tar.gz">
-  <!ENTITY libpcap-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/libpcap-&libpcap-version;.tar.gz">
+  <!ENTITY libpcap-download-ftp  "&gentoo-ftp-repo;/libpcap-&libpcap-version;.tar.gz">
   <!ENTITY libpcap-md5sum        "b0626ad59004fe5767ddd2ce743a2271">
   <!ENTITY libpcap-size          "433 KB">
Index: basicnet/netutils/nmap.xml
===================================================================
--- basicnet/netutils/nmap.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ basicnet/netutils/nmap.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -18,5 +18,5 @@
 
   <!ENTITY nmap-download-http "http://download.insecure.org/nmap/dist/nmap-&nmap-version;.tar.bz2">
-  <!ENTITY nmap-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/nmap-&nmap-version;.tar.bz2">
+  <!ENTITY nmap-download-ftp  "&gentoo-ftp-repo;/nmap-&nmap-version;.tar.bz2">
   <!ENTITY nmap-md5sum        "d2b841e97d81d0fac20d18cbeddfa54a">
   <!ENTITY nmap-size          "2.0 MB">
Index: connect/dialup/ppp.xml
===================================================================
--- connect/dialup/ppp.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ connect/dialup/ppp.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY ppp-download-http "http://samba.org/ftp/ppp/ppp-&ppp-version;.tar.gz">
-  <!ENTITY ppp-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/ppp-&ppp-version;.tar.gz">
+  <!ENTITY ppp-download-ftp  "&gentoo-ftp-repo;/ppp-&ppp-version;.tar.gz">
   <!ENTITY ppp-md5sum        "183800762e266132218b204dfb428d29">
   <!ENTITY ppp-size          "673 KB">
Index: general.ent
===================================================================
--- general.ent	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ general.ent	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -30,4 +30,5 @@
 <!-- <!ENTITY lfs-root             "http://www.&lfs-domainname;/lfs/view/&lfs-version;"> -->
 <!ENTITY lfs-root             "../../../../lfs/view/&lfs-version;">
+<!ENTITY gentoo-ftp-repo      "ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles">
 <!ENTITY publisher            "Unknown">
 
Index: general/genlib/gamin.xml
===================================================================
--- general/genlib/gamin.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ general/genlib/gamin.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY gamin-download-http "http://www.gnome.org/~veillard/gamin/sources/gamin-&gamin-version;.tar.gz">
-  <!ENTITY gamin-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/gamin-&gamin-version;.tar.gz">
+  <!ENTITY gamin-download-ftp  "&gentoo-ftp-repo;/gamin-&gamin-version;.tar.gz">
   <!ENTITY gamin-md5sum        "985022c8b1b993e471d528fd0e14ffbe">
   <!ENTITY gamin-size          "564 KB">
Index: general/genlib/gmime.xml
===================================================================
--- general/genlib/gmime.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ general/genlib/gmime.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -7,5 +7,5 @@
   <!ENTITY gmime-download-http "http://spruce.sourceforge.net/gmime/sources/v2.2/gmime-&gmime-version;.tar.gz">
   <!ENTITY gmime-download-ftp  " ">
-  <!-- <!ENTITY gmime-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/gmime-&gmime-version;.tar.gz"> -->
+  <!-- <!ENTITY gmime-download-ftp  "&gentoo-ftp-repo;/gmime-&gmime-version;.tar.gz"> -->
   <!ENTITY gmime-md5sum        "e9b07d187270dee4c30b1fe8392f396b">
   <!ENTITY gmime-size          "926 KB">
Index: general/genlib/gwrap.xml
===================================================================
--- general/genlib/gwrap.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ general/genlib/gwrap.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY gwrap-download-http "http://www.gnucash.org/pub/g-wrap/source/g-wrap-&gwrap-version;.tar.gz">
-  <!ENTITY gwrap-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/g-wrap-&gwrap-version;.tar.gz">
+  <!ENTITY gwrap-download-ftp  "&gentoo-ftp-repo;/g-wrap-&gwrap-version;.tar.gz">
   <!ENTITY gwrap-md5sum        "bf29b8b563cc27d9f7fd90a6243653aa">
   <!ENTITY gwrap-size          "403 KB">
Index: general/genlib/libdrm.xml
===================================================================
--- general/genlib/libdrm.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ general/genlib/libdrm.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY libdrm-download-http "http://dri.freedesktop.org/libdrm/libdrm-&libdrm-version;.tar.gz">
-  <!ENTITY libdrm-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/libdrm-&libdrm-version;.tar.gz">
+  <!ENTITY libdrm-download-ftp  "&gentoo-ftp-repo;/libdrm-&libdrm-version;.tar.gz">
   <!ENTITY libdrm-md5sum        "f2f5d3186bee51be49e1389bed39a7ed">
   <!ENTITY libdrm-size          "382 KB">
Index: general/genlib/libesmtp.xml
===================================================================
--- general/genlib/libesmtp.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ general/genlib/libesmtp.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY libesmtp-download-http "http://www.stafford.uklinux.net/libesmtp/libesmtp-&libesmtp-version;.tar.bz2">
-  <!ENTITY libesmtp-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/libesmtp-&libesmtp-version;.tar.bz2">
+  <!ENTITY libesmtp-download-ftp  "&gentoo-ftp-repo;/libesmtp-&libesmtp-version;.tar.bz2">
   <!ENTITY libesmtp-md5sum        "8b4e8a794adc46268f0c6a0b3fb79486">
   <!ENTITY libesmtp-size          "351 KB">
Index: general/genutils/graphviz.xml
===================================================================
--- general/genutils/graphviz.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ general/genutils/graphviz.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY graphviz-download-http "http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-&graphviz-version;.tar.gz">
-  <!ENTITY graphviz-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/graphviz-&graphviz-version;.tar.gz">
+  <!ENTITY graphviz-download-ftp  "&gentoo-ftp-repo;/graphviz-&graphviz-version;.tar.gz">
   <!ENTITY graphviz-md5sum        "e5547bc0ec47943c72f5c3e2b5dff58f">
   <!ENTITY graphviz-size          "4.6 MB">
Index: general/genutils/icon-naming-utils.xml
===================================================================
--- general/genutils/icon-naming-utils.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ general/genutils/icon-naming-utils.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY icon-naming-utils-download-http "http://tango.freedesktop.org/releases/icon-naming-utils-&icon-naming-utils-version;.tar.gz">
-  <!ENTITY icon-naming-utils-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/icon-naming-utils-&icon-naming-utils-version;.tar.gz">
+  <!ENTITY icon-naming-utils-download-ftp  "&gentoo-ftp-repo;/icon-naming-utils-&icon-naming-utils-version;.tar.gz">
   <!ENTITY icon-naming-utils-md5sum        "76e6afde567bd17b4fe095aa0ec90531">
   <!ENTITY icon-naming-utils-size          "66 KB">
Index: general/genutils/pilot-link.xml
===================================================================
--- general/genutils/pilot-link.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ general/genutils/pilot-link.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY pilot-link-download-http "http://www.pilot-link.org/files/pilot-link-&pilot-link-version;.tar.bz2">
-  <!ENTITY pilot-link-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/pilot-link-&pilot-link-version;.tar.bz2">
+  <!ENTITY pilot-link-download-ftp  "&gentoo-ftp-repo;/pilot-link-&pilot-link-version;.tar.bz2">
   <!ENTITY pilot-link-md5sum        "586f84add601e8b86da3093ab784e997">
   <!ENTITY pilot-link-size          "649 KB">
Index: general/genutils/unixodbc.xml
===================================================================
--- general/genutils/unixodbc.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ general/genutils/unixodbc.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY unixodbc-download-http "http://www.unixodbc.org/unixODBC-&unixodbc-version;.tar.gz">
-  <!ENTITY unixodbc-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/unixODBC-&unixodbc-version;.tar.gz">
+  <!ENTITY unixodbc-download-ftp  "&gentoo-ftp-repo;/unixODBC-&unixodbc-version;.tar.gz">
   <!ENTITY unixodbc-md5sum        "9a116aad4059c31d231b626ffdf1869a">
   <!ENTITY unixodbc-size          "2.7 MB">
Index: general/genutils/xscreensaver.xml
===================================================================
--- general/genutils/xscreensaver.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ general/genutils/xscreensaver.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY xscreensaver-download-http "http://www.jwz.org/xscreensaver/xscreensaver-&xscreensaver-version;.tar.gz">
-  <!ENTITY xscreensaver-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/xscreensaver-&xscreensaver-version;.tar.gz">
+  <!ENTITY xscreensaver-download-ftp  "&gentoo-ftp-repo;/xscreensaver-&xscreensaver-version;.tar.gz">
   <!ENTITY xscreensaver-md5sum        "174b6a7cebd892c1a6c2d56bf5ac5af6">
   <!ENTITY xscreensaver-size          "4.9 MB">
Index: general/graphlib/fontconfig.xml
===================================================================
--- general/graphlib/fontconfig.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ general/graphlib/fontconfig.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY fontconfig-download-http "http://fontconfig.org/release/fontconfig-&fontconfig-version;.tar.gz">
-  <!ENTITY fontconfig-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/fontconfig-&fontconfig-version;.tar.gz">
+  <!ENTITY fontconfig-download-ftp  "&gentoo-ftp-repo;/fontconfig-&fontconfig-version;.tar.gz">
   <!ENTITY fontconfig-md5sum        "108f9a03fa9ed9dd779cc7ca236da557">
   <!ENTITY fontconfig-size          "1.2 MB">
Index: general/graphlib/freetype2.xml
===================================================================
--- general/graphlib/freetype2.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ general/graphlib/freetype2.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY freetype2-download-http "http://downloads.sourceforge.net/freetype/freetype-&freetype2-version;.tar.bz2">
-  <!ENTITY freetype2-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/freetype-&freetype2-version;.tar.bz2">
+  <!ENTITY freetype2-download-ftp  "&gentoo-ftp-repo;/freetype-&freetype2-version;.tar.bz2">
   <!ENTITY freetype2-md5sum        "1a6c59a7723d637c78672e7784da865d">
   <!ENTITY freetype2-size          "1.2 MB">
@@ -13,5 +13,5 @@
 
   <!ENTITY freetype2-doc-download-http "http://downloads.sourceforge.net/freetype/freetype-doc-&freetype2-version;.tar.bz2">
-  <!ENTITY freetype2-doc-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/freetype-doc-&freetype2-version;.tar.bz2">
+  <!ENTITY freetype2-doc-download-ftp  "&gentoo-ftp-repo;/freetype-doc-&freetype2-version;.tar.bz2">
   <!ENTITY freetype2-doc-md5sum        "40cb37ba6c003845208c1b89cf507249">
   <!ENTITY freetype2-doc-size          "96.4 KB">
Index: general/graphlib/giflib.xml
===================================================================
--- general/graphlib/giflib.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ general/graphlib/giflib.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY giflib-download-http "http://downloads.sourceforge.net/libungif/giflib-&giflib-version;.tar.bz2">
-  <!ENTITY giflib-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/giflib-&giflib-version;.tar.gz">
+  <!ENTITY giflib-download-ftp  "&gentoo-ftp-repo;/giflib-&giflib-version;.tar.gz">
   <!ENTITY giflib-http-md5sum   "827d338961482a986f39c7f114531636">
   <!ENTITY giflib-http-size     "483 KB">
Index: general/graphlib/lcms.xml
===================================================================
--- general/graphlib/lcms.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ general/graphlib/lcms.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY lcms-download-http "http://www.littlecms.com/lcms-&lcms-version;.tar.gz">
-  <!ENTITY lcms-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/lcms-&lcms-version;.tar.gz">
+  <!ENTITY lcms-download-ftp  "&gentoo-ftp-repo;/lcms-&lcms-version;.tar.gz">
   <!ENTITY lcms-md5sum        "b07b623f3e712373ff713fb32cf23651">
   <!ENTITY lcms-size          "911 KB">
Index: general/prog/gc.xml
===================================================================
--- general/prog/gc.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ general/prog/gc.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY gc-download-http "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc&gc-version;.tar.gz">
-  <!ENTITY gc-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/gc&gc-version;.tar.gz">
+  <!ENTITY gc-download-ftp  "&gentoo-ftp-repo;/gc&gc-version;.tar.gz">
   <!ENTITY gc-md5sum        "418d38bd9c66398386a372ec0435250e">
   <!ENTITY gc-size          "739 KB">
Index: general/prog/pdl.xml
===================================================================
--- general/prog/pdl.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ general/prog/pdl.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -18,5 +18,5 @@
 
   <!ENTITY pdl-download-http "http://downloads.sourceforge.net/pdl/PDL-&pdl-version;.tar.gz">
-  <!ENTITY pdl-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/PDL-&pdl-version;.tar.gz">
+  <!ENTITY pdl-download-ftp  "&gentoo-ftp-repo;/PDL-&pdl-version;.tar.gz">
   <!ENTITY pdl-md5sum        "edd056a006eae8b46e8ef804b9774a93">
   <!ENTITY pdl-size          "2.1 MB">
Index: general/prog/python.xml
===================================================================
--- general/prog/python.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ general/prog/python.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY python-download-http "http://www.python.org/ftp/python/&Python-version;/Python-&Python-version;.tar.bz2">
-  <!ENTITY python-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/Python-&Python-version;.tar.bz2">
+  <!ENTITY python-download-ftp  "&gentoo-ftp-repo;/Python-&Python-version;.tar.bz2">
   <!ENTITY python-md5sum        "70084ffa561660f07de466c2c8c4842d">
   <!ENTITY python-size          "9.3 MB">
Index: general/prog/pyxml.xml
===================================================================
--- general/prog/pyxml.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ general/prog/pyxml.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY pyxml-download-http "http://downloads.sourceforge.net/pyxml/PyXML-&pyxml-version;.tar.gz">
-  <!ENTITY pyxml-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/PyXML-&pyxml-version;.tar.gz">
+  <!ENTITY pyxml-download-ftp  "&gentoo-ftp-repo;/PyXML-&pyxml-version;.tar.gz">
   <!ENTITY pyxml-md5sum        "1f7655050cebbb664db976405fdba209">
   <!ENTITY pyxml-size          "734 KB">
Index: general/sysutils/dbus.xml
===================================================================
--- general/sysutils/dbus.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ general/sysutils/dbus.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY dbus-download-http "http://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
-  <!ENTITY dbus-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/dbus-&dbus-version;.tar.gz">
+  <!ENTITY dbus-download-ftp  "&gentoo-ftp-repo;/dbus-&dbus-version;.tar.gz">
   <!ENTITY dbus-md5sum        "0552a9b54beb4a044951b7cdbc8fc855">
   <!ENTITY dbus-size          "1.3 MB">
Index: general/sysutils/gpm.xml
===================================================================
--- general/sysutils/gpm.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ general/sysutils/gpm.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -18,5 +18,5 @@
 
   <!ENTITY gpm-download-http "http://ftp.schottelius.org/pub/linux/gpm/gpm-&gpm-version;.tar.bz2">
-  <!ENTITY gpm-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/gpm-&gpm-version;.tar.bz2">
+  <!ENTITY gpm-download-ftp  "&gentoo-ftp-repo;/gpm-&gpm-version;.tar.bz2">
   <!ENTITY gpm-md5sum        "2c63e827d755527950d9d13fe3d87692">
   <!ENTITY gpm-size          "556 KB">
Index: general/sysutils/hal.xml
===================================================================
--- general/sysutils/hal.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ general/sysutils/hal.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY hal-download-http      "http://freedesktop.org/~david/dist/hal-&hal-version;.tar.gz">
-  <!-- <!ENTITY hal-download-ftp       "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/hal-&hal-version;.tar.gz"> -->
+  <!-- <!ENTITY hal-download-ftp       "&gentoo-ftp-repo;/hal-&hal-version;.tar.gz"> -->
   <!ENTITY hal-download-ftp       " ">
   <!ENTITY hal-md5sum             "6a40f49f964e64358e53652038f3059f">
@@ -15,5 +15,5 @@
   <!ENTITY hal-info-version       "20070618">
   <!ENTITY hal-info-download-http "http://freedesktop.org/~david/dist/hal-info-&hal-info-version;.tar.gz">
-  <!-- <!ENTITY hal-info-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/hal-info-&hal-info-version;.tar.gz"> -->
+  <!-- <!ENTITY hal-info-download-ftp  "&gentoo-ftp-repo;/hal-info-&hal-info-version;.tar.gz"> -->
   <!ENTITY hal-info-download-ftp  " ">
   <!ENTITY hal-info-md5sum        "c7005ccb1765d8359fd2348350770495">
Index: general/sysutils/pkgconfig.xml
===================================================================
--- general/sysutils/pkgconfig.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ general/sysutils/pkgconfig.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY pkgconfig-download-http "http://pkgconfig.freedesktop.org/releases/pkg-config-&pkgconfig-version;.tar.gz">
-  <!ENTITY pkgconfig-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/pkg-config-&pkgconfig-version;.tar.gz">
+  <!ENTITY pkgconfig-download-ftp  "&gentoo-ftp-repo;/pkg-config-&pkgconfig-version;.tar.gz">
   <!-- <!ENTITY pkgconfig-download-ftp "&gnome-download-ftp;/pkgconfig/&pkgconfig-version;/pkgconfig-&pkgconfig-version;.tar.gz"> -->
   <!ENTITY pkgconfig-md5sum        "fd5c547e9d66ba49bc735ccb8c791f2a">
Index: multimedia/audioutils/audacious.xml
===================================================================
--- multimedia/audioutils/audacious.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ multimedia/audioutils/audacious.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY audacious-download-http "http://audacious-media-player.org/release/audacious-&audacious-version;.tgz">
-  <!ENTITY audacious-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/audacious-&audacious-version;.tgz">
+  <!ENTITY audacious-download-ftp  "&gentoo-ftp-repo;/audacious-&audacious-version;.tgz">
   <!ENTITY audacious-md5sum        "a3e0f49be74eecb3c27a5a901cff0b66">
   <!ENTITY audacious-size          "3.1 MB">
Index: multimedia/audioutils/xmms.xml
===================================================================
--- multimedia/audioutils/xmms.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ multimedia/audioutils/xmms.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY XMMS-download-http "http://www.xmms.org/files/1.2.x/xmms-&XMMS-version;.tar.bz2">
-  <!ENTITY XMMS-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/xmms-&XMMS-version;.tar.bz2">
+  <!ENTITY XMMS-download-ftp  "&gentoo-ftp-repo;/xmms-&XMMS-version;.tar.bz2">
   <!ENTITY XMMS-md5sum        "03a85cfc5e1877a2e1f7be4fa1d3f63c">
   <!ENTITY XMMS-size          "2.4 MB">
Index: multimedia/libdriv/libao.xml
===================================================================
--- multimedia/libdriv/libao.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ multimedia/libdriv/libao.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY libao-download-http "http://downloads.xiph.org/releases/ao/libao-&libao-version;.tar.gz">
-  <!ENTITY libao-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/libao-&libao-version;.tar.gz">
+  <!ENTITY libao-download-ftp  "&gentoo-ftp-repo;/libao-&libao-version;.tar.gz">
   <!ENTITY libao-md5sum        "12e136a4c0995068ff134997c84421ed">
   <!ENTITY libao-size          "387 KB">
Index: multimedia/libdriv/libdvdcss.xml
===================================================================
--- multimedia/libdriv/libdvdcss.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ multimedia/libdriv/libdvdcss.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY libdvdcss-download-http "http://www.videolan.org/pub/libdvdcss/&libdvdcss-version;/libdvdcss-&libdvdcss-version;.tar.bz2">
-  <!ENTITY libdvdcss-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/libdvdcss-&libdvdcss-version;.tar.bz2">
+  <!ENTITY libdvdcss-download-ftp  "&gentoo-ftp-repo;/libdvdcss-&libdvdcss-version;.tar.bz2">
   <!ENTITY libdvdcss-md5sum        "553383d898826c285afb2ee453b07868">
   <!ENTITY libdvdcss-size          "283 KB">
Index: multimedia/libdriv/libdvdread.xml
===================================================================
--- multimedia/libdriv/libdvdread.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ multimedia/libdriv/libdvdread.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY libdvdread-download-http "http://www.dtek.chalmers.se/groups/dvd/dist/libdvdread-&libdvdread-version;.tar.gz">
-  <!ENTITY libdvdread-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/libdvdread-&libdvdread-version;.tar.gz">
+  <!ENTITY libdvdread-download-ftp  "&gentoo-ftp-repo;/libdvdread-&libdvdread-version;.tar.gz">
   <!ENTITY libdvdread-md5sum        "329401b84ad0b00aaccaad58f2fc393c">
   <!ENTITY libdvdread-size          "383 KB">
Index: multimedia/libdriv/libfame.xml
===================================================================
--- multimedia/libdriv/libfame.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ multimedia/libdriv/libfame.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY libfame-download-http "http://downloads.sourceforge.net/fame/libfame-&libfame-version;.tar.gz">
-  <!ENTITY libfame-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/libfame-&libfame-version;.tar.gz">
+  <!ENTITY libfame-download-ftp  "&gentoo-ftp-repo;/libfame-&libfame-version;.tar.gz">
   <!ENTITY libfame-md5sum        "880085761e17a3b4fc41f4f6f198fd3b">
   <!ENTITY libfame-size          "290 KB">
Index: multimedia/libdriv/libmikmod.xml
===================================================================
--- multimedia/libdriv/libmikmod.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ multimedia/libdriv/libmikmod.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -18,5 +18,5 @@
 
   <!ENTITY libmikmod-download-http "http://mikmod.raphnet.net/files/libmikmod-&libmikmod-version;.tar.gz">
-  <!ENTITY libmikmod-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/libmikmod-&libmikmod-version;.tar.gz">
+  <!ENTITY libmikmod-download-ftp  "&gentoo-ftp-repo;/libmikmod-&libmikmod-version;.tar.gz">
   <!ENTITY libmikmod-md5sum        "705106da305e8de191549f1e7393185c">
   <!ENTITY libmikmod-size          "604 KB">
Index: multimedia/libdriv/libmpeg2.xml
===================================================================
--- multimedia/libdriv/libmpeg2.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ multimedia/libdriv/libmpeg2.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY libmpeg2-download-http "http://libmpeg2.sourceforge.net/files/mpeg2dec-&libmpeg2-version;.tar.gz">
-  <!ENTITY libmpeg2-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles//mpeg2dec-&libmpeg2-version;.tar.gz">
+  <!ENTITY libmpeg2-download-ftp  "&gentoo-ftp-repo;//mpeg2dec-&libmpeg2-version;.tar.gz">
   <!ENTITY libmpeg2-md5sum        "52d10ea80595ec83d8557ba7ac6dc8e6">
   <!ENTITY libmpeg2-size          "473 KB">
Index: multimedia/libdriv/libquicktime.xml
===================================================================
--- multimedia/libdriv/libquicktime.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ multimedia/libdriv/libquicktime.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY libquicktime-download-http "http://downloads.sourceforge.net/libquicktime/libquicktime-&libquicktime-version;.tar.gz">
-  <!ENTITY libquicktime-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/libquicktime-&libquicktime-version;.tar.gz">
+  <!ENTITY libquicktime-download-ftp  "&gentoo-ftp-repo;/libquicktime-&libquicktime-version;.tar.gz">
   <!ENTITY libquicktime-md5sum        "4ac23264f22a22ff013722aa9d188190">
   <!ENTITY libquicktime-size          "926 KB">
Index: multimedia/libdriv/nas.xml
===================================================================
--- multimedia/libdriv/nas.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ multimedia/libdriv/nas.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY nas-download-http "http://nas.codebrilliance.com/nas/nas-&nas-version;.src.tar.gz">
-  <!ENTITY nas-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/nas-&nas-version;.src.tar.gz">
+  <!ENTITY nas-download-ftp  "&gentoo-ftp-repo;/nas-&nas-version;.src.tar.gz">
   <!ENTITY nas-md5sum        "aac031fae04f53bcd1e033b380b1b29d">
   <!ENTITY nas-size          "1.4 MB">
Index: multimedia/libdriv/xine-lib.xml
===================================================================
--- multimedia/libdriv/xine-lib.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ multimedia/libdriv/xine-lib.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY xine-lib-download-http "http://downloads.sourceforge.net/xine/xine-lib-&xine-lib-version;.tar.gz">
-  <!ENTITY xine-lib-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/xine-lib-&xine-lib-version;.tar.gz">
+  <!ENTITY xine-lib-download-ftp  "&gentoo-ftp-repo;/xine-lib-&xine-lib-version;.tar.gz">
   <!ENTITY xine-lib-md5sum        "9dc1a4f81ccd644e4c0e294ff35fb76d">
   <!ENTITY xine-lib-size          "7.0 MB">
Index: multimedia/videoutils/transcode.xml
===================================================================
--- multimedia/videoutils/transcode.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ multimedia/videoutils/transcode.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY transcode-download-http "http://transcode.kabewm.com/transcode-&transcode-version;.tar.gz">
-  <!ENTITY transcode-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/transcode-&transcode-version;.tar.gz">
+  <!ENTITY transcode-download-ftp  "&gentoo-ftp-repo;/transcode-&transcode-version;.tar.gz">
   <!ENTITY transcode-md5sum        "e353c0ab7e927a8672528e05a9ae960b">
   <!ENTITY transcode-size          "2.3 MB">
Index: multimedia/videoutils/xine-ui.xml
===================================================================
--- multimedia/videoutils/xine-ui.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ multimedia/videoutils/xine-ui.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY xine-ui-download-http "http://downloads.sourceforge.net/xine/xine-ui-&xine-ui-version;.tar.gz">
-  <!ENTITY xine-ui-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/xine-ui-&xine-ui-version;.tar.gz">
+  <!ENTITY xine-ui-download-ftp  "&gentoo-ftp-repo;/xine-ui-&xine-ui-version;.tar.gz">
   <!ENTITY xine-ui-md5sum        "90ea1f76747e9788a30a73e7f4a76cf6">
   <!ENTITY xine-ui-size          "2.5 MB">
Index: postlfs/security/cracklib.xml
===================================================================
--- postlfs/security/cracklib.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ postlfs/security/cracklib.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY cracklib-download-http "http://downloads.sourceforge.net/cracklib/cracklib-&cracklib-version;.tar.gz">
-  <!ENTITY cracklib-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/cracklib-&cracklib-version;.tar.gz">
+  <!ENTITY cracklib-download-ftp  "&gentoo-ftp-repo;/cracklib-&cracklib-version;.tar.gz">
   <!ENTITY cracklib-md5sum        "555f7832b63ebc7fb70b0373500c2358">
   <!ENTITY cracklib-size          "577 KB">
Index: pst/ps/enscript.xml
===================================================================
--- pst/ps/enscript.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ pst/ps/enscript.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -10,5 +10,5 @@
 
   <!ENTITY enscript-download-http "http://fresh.t-systems-sfr.com/unix/src/misc/enscript-&enscript-version;.tar.gz">
-  <!ENTITY enscript-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/enscript-&enscript-version;.tar.gz">
+  <!ENTITY enscript-download-ftp  "&gentoo-ftp-repo;/enscript-&enscript-version;.tar.gz">
   <!ENTITY enscript-md5sum        "b5174b59e4a050fb462af5dbf28ebba3">
   <!ENTITY enscript-size          "1.0 MB">
Index: pst/scanning/sane.xml
===================================================================
--- pst/scanning/sane.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ pst/scanning/sane.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -7,5 +7,5 @@
   <!ENTITY sane-be-download-http "http://alioth.debian.org/download.php/1347/sane-backends-&sane-version;.tar.gz">
   <!-- <!ENTITY sane-be-download-ftp  "ftp://ftp.sane-project.org/pub/sane/sane-backends-&sane-version;/sane-backends-&sane-version;.tar.gz"> -->
-  <!ENTITY sane-be-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/sane-backends-&sane-version;.tar.gz">
+  <!ENTITY sane-be-download-ftp  "&gentoo-ftp-repo;/sane-backends-&sane-version;.tar.gz">
   <!ENTITY sane-be-md5sum        "b51c10da8a81a04e1bae88c9e6556df2">
   <!ENTITY sane-be-size          "3.5 MB">
Index: pst/sgml/docbook-dsssl.xml
===================================================================
--- pst/sgml/docbook-dsssl.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ pst/sgml/docbook-dsssl.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -18,5 +18,5 @@
 
   <!ENTITY docbook-dsssl-download-http "http://downloads.sourceforge.net/docbook/docbook-dsssl-&docbook-dsssl-version;.tar.bz2">
-  <!ENTITY docbook-dsssl-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/docbook-dsssl-&docbook-dsssl-version;.tar.bz2">
+  <!ENTITY docbook-dsssl-download-ftp  "&gentoo-ftp-repo;/docbook-dsssl-&docbook-dsssl-version;.tar.bz2">
   <!ENTITY docbook-dsssl-md5sum        "bc192d23266b9a664ca0aba4a7794c7c">
   <!ENTITY docbook-dsssl-size          "277 KB">
Index: pst/sgml/opensp.xml
===================================================================
--- pst/sgml/opensp.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ pst/sgml/opensp.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -8,5 +8,5 @@
   <!ENTITY opensp-download-ftp  " ">
 <!--
-  <!ENTITY opensp-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/OpenSP-&opensp-version;.tar.gz">
+  <!ENTITY opensp-download-ftp  "&gentoo-ftp-repo;/OpenSP-&opensp-version;.tar.gz">
 -->
   <!ENTITY opensp-md5sum        "670b223c5d12cee40c9137be86b6c39b">
Index: pst/typesetting/jadetex.xml
===================================================================
--- pst/typesetting/jadetex.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ pst/typesetting/jadetex.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -18,5 +18,5 @@
 
   <!ENTITY jadetex-download-http "http://downloads.sourceforge.net/jadetex/jadetex-&jadetex-version;.tar.gz">
-  <!ENTITY jadetex-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/jadetex-&jadetex-version;.tar.gz">
+  <!ENTITY jadetex-download-ftp  "&gentoo-ftp-repo;/jadetex-&jadetex-version;.tar.gz">
   <!ENTITY jadetex-md5sum        "634dfc172fbf66a6976e2c2c60e2d198">
   <!ENTITY jadetex-size          "103 KB">
Index: pst/xml/docbook.xml
===================================================================
--- pst/xml/docbook.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ pst/xml/docbook.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY DocBook-download-http "http://www.docbook.org/xml/&DocBook-version;/docbook-xml-&DocBook-version;.zip">
-  <!ENTITY DocBook-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/docbook-xml-&DocBook-version;.zip">
+  <!ENTITY DocBook-download-ftp  "&gentoo-ftp-repo;/docbook-xml-&DocBook-version;.zip">
   <!ENTITY DocBook-md5sum        "03083e288e87a7e829e437358da7ef9e">
   <!ENTITY DocBook-size          "96 KB">
Index: server/databases/db.xml
===================================================================
--- server/databases/db.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ server/databases/db.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY db-download-http "http://download-east.oracle.com/berkeley-db/db-&db-version;.tar.gz">
-  <!ENTITY db-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/db-&db-version;.tar.gz">
+  <!ENTITY db-download-ftp  "&gentoo-ftp-repo;/db-&db-version;.tar.gz">
   <!ENTITY db-md5sum        "b0f1c777708cb8e9d37fb47e7ed3312d">
   <!ENTITY db-size          "9.2 MB">
Index: server/major/xinetd.xml
===================================================================
--- server/major/xinetd.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ server/major/xinetd.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY xinetd-download-http "http://www.xinetd.org/xinetd-&xinetd-version;.tar.gz">
-  <!ENTITY xinetd-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/xinetd-&xinetd-version;.tar.gz">
+  <!ENTITY xinetd-download-ftp  "&gentoo-ftp-repo;/xinetd-&xinetd-version;.tar.gz">
   <!ENTITY xinetd-md5sum        "567382d7972613090215c6c54f9b82d9">
   <!ENTITY xinetd-size          "301 KB">
Index: server/other/rsync.xml
===================================================================
--- server/other/rsync.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ server/other/rsync.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -8,5 +8,5 @@
   <!-- <!ENTITY rsync-download-ftp "ftp://ftp.samba.org/pub/rsync/rsync-&rsync-version;.tar.gz"> -->
   <!ENTITY rsync-download-http "http://rsync.samba.org/ftp/rsync/old-versions/rsync-&rsync-version;.tar.gz">
-  <!ENTITY rsync-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/rsync-&rsync-version;.tar.gz">
+  <!ENTITY rsync-download-ftp  "&gentoo-ftp-repo;/rsync-&rsync-version;.tar.gz">
   <!ENTITY rsync-md5sum        "082a9dba1f741e6591e5cd748a1233de">
   <!ENTITY rsync-size          "760 KB">
Index: x/lib/hicolor-icon-theme.xml
===================================================================
--- x/lib/hicolor-icon-theme.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ x/lib/hicolor-icon-theme.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY hicolor-icon-theme-download-http "http://icon-theme.freedesktop.org/releases/hicolor-icon-theme-&hicolor-icon-theme-version;.tar.gz">
-  <!ENTITY hicolor-icon-theme-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/hicolor-icon-theme-&hicolor-icon-theme-version;.tar.gz">
+  <!ENTITY hicolor-icon-theme-download-ftp  "&gentoo-ftp-repo;/hicolor-icon-theme-&hicolor-icon-theme-version;.tar.gz">
   <!ENTITY hicolor-icon-theme-md5sum        "3534f7b8e59785c7d5bfa923e85510a7">
   <!ENTITY hicolor-icon-theme-size          "33 KB">
Index: x/lib/shared-mime-info.xml
===================================================================
--- x/lib/shared-mime-info.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ x/lib/shared-mime-info.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -7,5 +7,5 @@
   <!ENTITY shared-mime-info-download-http "http://freedesktop.org/~hadess/shared-mime-info-&shared-mime-info-version;.tar.bz2">
   <!ENTITY shared-mime-info-download-ftp  "ftp://anduin.linuxfromscratch.org/BLFS/svn/s/shared-mime-info-&shared-mime-info-version;.tar.bz2">
-  <!-- <!ENTITY shared-mime-info-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/shared-mime-info-&shared-mime-info-version;.tar.bz2"> -->
+  <!-- <!ENTITY shared-mime-info-download-ftp  "&gentoo-ftp-repo;/shared-mime-info-&shared-mime-info-version;.tar.bz2"> -->
   <!ENTITY shared-mime-info-md5sum        "62184241d497d34138285bc248b3fabc">
   <!ENTITY shared-mime-info-size          "429 KB">
Index: xsoft/graphweb/dillo.xml
===================================================================
--- xsoft/graphweb/dillo.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ xsoft/graphweb/dillo.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY dillo-download-http "http://www.dillo.org/download/dillo-&dillo-version;.tar.bz2">
-  <!ENTITY dillo-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/dillo-&dillo-version;.tar.bz2">
+  <!ENTITY dillo-download-ftp  "&gentoo-ftp-repo;/dillo-&dillo-version;.tar.bz2">
   <!ENTITY dillo-md5sum        "d0ab7fa1d40b310deb891388604188f8">
   <!ENTITY dillo-size          "415 KB">
Index: xsoft/graphweb/galeon.xml
===================================================================
--- xsoft/graphweb/galeon.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ xsoft/graphweb/galeon.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY galeon-download-http "http://downloads.sourceforge.net/galeon/galeon-&galeon-version;.tar.bz2">
-  <!ENTITY galeon-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/galeon-&galeon-version;.tar.bz2">
+  <!ENTITY galeon-download-ftp  "&gentoo-ftp-repo;/galeon-&galeon-version;.tar.bz2">
   <!ENTITY galeon-md5sum        "34d6e3a6ee78f9e4d12736e5d81b462b">
   <!ENTITY galeon-size          "2.9 MB">
Index: xsoft/other/xchat.xml
===================================================================
--- xsoft/other/xchat.xml	(revision 6b8211c23e35d65b7f1c9d5893daeee5e5f9e5ad)
+++ xsoft/other/xchat.xml	(revision fb2e525ac77a14b430ce5b9cfdead4903db0527c)
@@ -6,5 +6,5 @@
 
   <!ENTITY xchat-download-http "http://www.xchat.org/files/source/2.6/xchat-&xchat-version;.tar.bz2">
-  <!ENTITY xchat-download-ftp  "ftp://ftp.fu-berlin.de/unix/linux/mirrors/gentoo/distfiles/xchat-&xchat-version;.tar.bz2">
+  <!ENTITY xchat-download-ftp  "&gentoo-ftp-repo;/xchat-&xchat-version;.tar.bz2">
   <!ENTITY xchat-md5sum        "6b534baf9a4df6bf23d7d16f7e4eb379">
   <!ENTITY xchat-size          "1.0 MB">
