Index: gnome/add/bug-buddy.xml
===================================================================
--- gnome/add/bug-buddy.xml	(revision 6d0910f1c6e673cf073453d94e780c9acf8e35fd)
+++ gnome/add/bug-buddy.xml	(revision 8b158789c2b2a1583cf05cb6d44764462b0422e8)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY bug-buddy-download-http "&gnome-download-http;/bug-buddy/&gnome-version;/bug-buddy-&bug-buddy-version;.tar.bz2">
-  <!ENTITY bug-buddy-download-ftp  "&gnome-download-ftp;/bug-buddy/&gnome-version;/bug-buddy-&bug-buddy-version;.tar.bz2">
+  <!ENTITY bug-buddy-download-http "&gnome-download-http;/bug-buddy/&gnome-old-version;/bug-buddy-&bug-buddy-version;.tar.bz2">
+  <!ENTITY bug-buddy-download-ftp  "&gnome-download-ftp;/bug-buddy/&gnome-old-version;/bug-buddy-&bug-buddy-version;.tar.bz2">
   <!ENTITY bug-buddy-md5sum        "ebeaeee4acc1432b59a4ef242abff620">
   <!ENTITY bug-buddy-size          "553 KB">
Index: gnome/add/eog.xml
===================================================================
--- gnome/add/eog.xml	(revision 6d0910f1c6e673cf073453d94e780c9acf8e35fd)
+++ gnome/add/eog.xml	(revision 8b158789c2b2a1583cf05cb6d44764462b0422e8)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY eog-download-http "&gnome-download-http;/eog/&gnome-version;/eog-&eog-version;.tar.bz2">
-  <!ENTITY eog-download-ftp  "&gnome-download-ftp;/eog/&gnome-version;/eog-&eog-version;.tar.bz2">
+  <!ENTITY eog-download-http "&gnome-download-http;/eog/&gnome-old-version;/eog-&eog-version;.tar.bz2">
+  <!ENTITY eog-download-ftp  "&gnome-download-ftp;/eog/&gnome-old-version;/eog-&eog-version;.tar.bz2">
   <!ENTITY eog-md5sum        "7e5fc342201ea00404008258c19b4461">
   <!ENTITY eog-size          "1.2 MB">
Index: gnome/add/epiphany.xml
===================================================================
--- gnome/add/epiphany.xml	(revision 6d0910f1c6e673cf073453d94e780c9acf8e35fd)
+++ gnome/add/epiphany.xml	(revision 8b158789c2b2a1583cf05cb6d44764462b0422e8)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY epiphany-download-http "&gnome-download-http;/epiphany/&gnome-version;/epiphany-&epiphany-version;.tar.bz2">
-  <!ENTITY epiphany-download-ftp  "&gnome-download-ftp;/epiphany/&gnome-version;/epiphany-&epiphany-version;.tar.bz2">
+  <!ENTITY epiphany-download-http "&gnome-download-http;/epiphany/&gnome-old-version;/epiphany-&epiphany-version;.tar.bz2">
+  <!ENTITY epiphany-download-ftp  "&gnome-download-ftp;/epiphany/&gnome-old-version;/epiphany-&epiphany-version;.tar.bz2">
   <!ENTITY epiphany-md5sum        "2e77f3f0651a27cac29224e82c3cc793">
   <!ENTITY epiphany-size          "4.7 MB">
Index: gnome/add/file-roller.xml
===================================================================
--- gnome/add/file-roller.xml	(revision 6d0910f1c6e673cf073453d94e780c9acf8e35fd)
+++ gnome/add/file-roller.xml	(revision 8b158789c2b2a1583cf05cb6d44764462b0422e8)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY file-roller-download-http "&gnome-download-http;/file-roller/&gnome-version;/file-roller-&file-roller-version;.tar.bz2">
-  <!ENTITY file-roller-download-ftp  "&gnome-download-ftp;/file-roller/&gnome-version;/file-roller-&file-roller-version;.tar.bz2">
+  <!ENTITY file-roller-download-http "&gnome-download-http;/file-roller/&gnome-old-version;/file-roller-&file-roller-version;.tar.bz2">
+  <!ENTITY file-roller-download-ftp  "&gnome-download-ftp;/file-roller/&gnome-old-version;/file-roller-&file-roller-version;.tar.bz2">
   <!ENTITY file-roller-md5sum        "f651f951d5c1c24288c1a25b1f567be0">
   <!ENTITY file-roller-size          "1.1 MB">
Index: gnome/add/gconf-editor.xml
===================================================================
--- gnome/add/gconf-editor.xml	(revision 6d0910f1c6e673cf073453d94e780c9acf8e35fd)
+++ gnome/add/gconf-editor.xml	(revision 8b158789c2b2a1583cf05cb6d44764462b0422e8)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gconf-editor-download-http "&gnome-download-http;/gconf-editor/&gnome-version;/gconf-editor-&gconf-editor-version;.tar.bz2">
-  <!ENTITY gconf-editor-download-ftp  "&gnome-download-ftp;/gconf-editor/&gnome-version;/gconf-editor-&gconf-editor-version;.tar.bz2">
+  <!ENTITY gconf-editor-download-http "&gnome-download-http;/gconf-editor/&gnome-old-version;/gconf-editor-&gconf-editor-version;.tar.bz2">
+  <!ENTITY gconf-editor-download-ftp  "&gnome-download-ftp;/gconf-editor/&gnome-old-version;/gconf-editor-&gconf-editor-version;.tar.bz2">
   <!ENTITY gconf-editor-md5sum        "cbaefa1ff8a548a3d381c67aed426fb7">
   <!ENTITY gconf-editor-size          "694 KB">
Index: gnome/add/gdm.xml
===================================================================
--- gnome/add/gdm.xml	(revision 6d0910f1c6e673cf073453d94e780c9acf8e35fd)
+++ gnome/add/gdm.xml	(revision 8b158789c2b2a1583cf05cb6d44764462b0422e8)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gdm-download-http "&gnome-download-http;/gdm/&gnome-version;/gdm-&gdm-version;.tar.bz2">
-  <!ENTITY gdm-download-ftp  "&gnome-download-ftp;/gdm/&gnome-version;/gdm-&gdm-version;.tar.bz2">
+  <!ENTITY gdm-download-http "&gnome-download-http;/gdm/&gnome-old-version;/gdm-&gdm-version;.tar.bz2">
+  <!ENTITY gdm-download-ftp  "&gnome-download-ftp;/gdm/&gnome-old-version;/gdm-&gdm-version;.tar.bz2">
   <!ENTITY gdm-md5sum        "08555fce34d247062625c1a451a4d5a6">
   <!ENTITY gdm-size          "3.4 MB">
@@ -158,5 +158,5 @@
 
       <indexterm zone="gdm gdm-config">
-        <primary sortas="e-etc-gnome-&gnome-version;&gnome-minor-version;gdm-custom.conf">
+        <primary sortas="e-etc-gnome-&gnome-old-version;&gnome-minor-version;gdm-custom.conf">
         &gnome-etc-dir;/gdm/custom.conf</primary>
       </indexterm>
@@ -273,5 +273,5 @@
       <envar>GNOME_PREFIX</envar> environment variable is anything other than
       <filename class='directory'>/usr</filename> or <filename
-      class='directory'>/opt/gnome-&gnome-version;&gnome-minor-version;</filename>,
+      class='directory'>/opt/gnome-&gnome-old-version;&gnome-minor-version;</filename>,
       you will need to modify the <envar>PATH</envar> statement in the script
       to include the path where you have <application>GNOME</application>
Index: gnome/add/gedit.xml
===================================================================
--- gnome/add/gedit.xml	(revision 6d0910f1c6e673cf073453d94e780c9acf8e35fd)
+++ gnome/add/gedit.xml	(revision 8b158789c2b2a1583cf05cb6d44764462b0422e8)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gedit-download-http "&gnome-download-http;/gedit/&gnome-version;/gedit-&gedit-version;.tar.bz2">
-  <!ENTITY gedit-download-ftp  "&gnome-download-ftp;/gedit/&gnome-version;/gedit-&gedit-version;.tar.bz2">
+  <!ENTITY gedit-download-http "&gnome-download-http;/gedit/&gnome-old-version;/gedit-&gedit-version;.tar.bz2">
+  <!ENTITY gedit-download-ftp  "&gnome-download-ftp;/gedit/&gnome-old-version;/gedit-&gedit-version;.tar.bz2">
   <!ENTITY gedit-md5sum        "7e8bf29bd6bf0d17ceaf42d9bd5d94e6">
   <!ENTITY gedit-size          "3.4 MB">
Index: gnome/add/gnome-games.xml
===================================================================
--- gnome/add/gnome-games.xml	(revision 6d0910f1c6e673cf073453d94e780c9acf8e35fd)
+++ gnome/add/gnome-games.xml	(revision 8b158789c2b2a1583cf05cb6d44764462b0422e8)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-games-download-http "&gnome-download-http;/gnome-games/&gnome-version;/gnome-games-&gnome-games-version;.tar.bz2">
-  <!ENTITY gnome-games-download-ftp  "&gnome-download-ftp;/gnome-games/&gnome-version;/gnome-games-&gnome-games-version;.tar.bz2">
+  <!ENTITY gnome-games-download-http "&gnome-download-http;/gnome-games/&gnome-old-version;/gnome-games-&gnome-games-version;.tar.bz2">
+  <!ENTITY gnome-games-download-ftp  "&gnome-download-ftp;/gnome-games/&gnome-old-version;/gnome-games-&gnome-games-version;.tar.bz2">
   <!ENTITY gnome-games-md5sum        "c3434a724cd72a536ba48d9187f10697">
   <!ENTITY gnome-games-size          "7.5 MB">
@@ -35,5 +35,5 @@
     can download the <application>GNOME</application> Games Extra Data package
     from <ulink
-    url="&gnome-download-http;/gnome-games-extra-data/&gnome-version;/"/>.
+    url="&gnome-download-http;/gnome-games-extra-data/&gnome-old-version;/"/>.
     </para>
 
Index: gnome/add/gnome-keyring-manager.xml
===================================================================
--- gnome/add/gnome-keyring-manager.xml	(revision 6d0910f1c6e673cf073453d94e780c9acf8e35fd)
+++ gnome/add/gnome-keyring-manager.xml	(revision 8b158789c2b2a1583cf05cb6d44764462b0422e8)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-keyring-manager-download-http "&gnome-download-http;/gnome-keyring-manager/&gnome-version;/gnome-keyring-manager-&gnome-keyring-manager-version;.tar.bz2">
-  <!ENTITY gnome-keyring-manager-download-ftp  "&gnome-download-ftp;/gnome-keyring-manager/&gnome-version;/gnome-keyring-manager-&gnome-keyring-manager-version;.tar.bz2">
+  <!ENTITY gnome-keyring-manager-download-http "&gnome-download-http;/gnome-keyring-manager/&gnome-old-version;/gnome-keyring-manager-&gnome-keyring-manager-version;.tar.bz2">
+  <!ENTITY gnome-keyring-manager-download-ftp  "&gnome-download-ftp;/gnome-keyring-manager/&gnome-old-version;/gnome-keyring-manager-&gnome-keyring-manager-version;.tar.bz2">
   <!ENTITY gnome-keyring-manager-md5sum        "05183cdea9d933cb1e9a8f4202c6ffc0">
   <!ENTITY gnome-keyring-manager-size          "455 KB">
Index: gnome/add/gnome-media.xml
===================================================================
--- gnome/add/gnome-media.xml	(revision 6d0910f1c6e673cf073453d94e780c9acf8e35fd)
+++ gnome/add/gnome-media.xml	(revision 8b158789c2b2a1583cf05cb6d44764462b0422e8)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-media-download-http "&gnome-download-http;/gnome-media/&gnome-version;/gnome-media-&gnome-media-version;.tar.bz2">
-  <!ENTITY gnome-media-download-ftp  "&gnome-download-ftp;/gnome-media/&gnome-version;/gnome-media-&gnome-media-version;.tar.bz2">
+  <!ENTITY gnome-media-download-http "&gnome-download-http;/gnome-media/&gnome-old-version;/gnome-media-&gnome-media-version;.tar.bz2">
+  <!ENTITY gnome-media-download-ftp  "&gnome-download-ftp;/gnome-media/&gnome-old-version;/gnome-media-&gnome-media-version;.tar.bz2">
   <!ENTITY gnome-media-md5sum        "a472d8c7733b119376bc6127ee55a82d">
   <!ENTITY gnome-media-size          "3.0 MB">
Index: gnome/add/gnome-screensaver.xml
===================================================================
--- gnome/add/gnome-screensaver.xml	(revision 6d0910f1c6e673cf073453d94e780c9acf8e35fd)
+++ gnome/add/gnome-screensaver.xml	(revision 8b158789c2b2a1583cf05cb6d44764462b0422e8)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-screensaver-download-http "&gnome-download-http;/gnome-screensaver/&gnome-version;/gnome-screensaver-&gnome-screensaver-version;.tar.bz2">
-  <!ENTITY gnome-screensaver-download-ftp  "&gnome-download-ftp;/gnome-screensaver/&gnome-version;/gnome-screensaver-&gnome-screensaver-version;.tar.bz2">
+  <!ENTITY gnome-screensaver-download-http "&gnome-download-http;/gnome-screensaver/&gnome-old-version;/gnome-screensaver-&gnome-screensaver-version;.tar.bz2">
+  <!ENTITY gnome-screensaver-download-ftp  "&gnome-download-ftp;/gnome-screensaver/&gnome-old-version;/gnome-screensaver-&gnome-screensaver-version;.tar.bz2">
   <!ENTITY gnome-screensaver-md5sum        "b5931e1f39c62acee0df1fcf016ddc39">
   <!ENTITY gnome-screensaver-size          "2.0 MB">
@@ -213,5 +213,5 @@
       </indexterm>
       <indexterm zone="gnome-screensaver gnome-screensaver-config">
-        <primary sortas="etc-gnome-&gnome-version;&gnome-minor-version;gdm-custom.conf">
+        <primary sortas="etc-gnome-&gnome-old-version;&gnome-minor-version;gdm-custom.conf">
         &gnome-etc-dir;/gdm/custom.conf</primary>
       </indexterm>
Index: gnome/add/gnome-system-monitor.xml
===================================================================
--- gnome/add/gnome-system-monitor.xml	(revision 6d0910f1c6e673cf073453d94e780c9acf8e35fd)
+++ gnome/add/gnome-system-monitor.xml	(revision 8b158789c2b2a1583cf05cb6d44764462b0422e8)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-system-monitor-download-http "&gnome-download-http;/gnome-system-monitor/&gnome-version;/gnome-system-monitor-&gnome-system-monitor-version;.tar.bz2">
-  <!ENTITY gnome-system-monitor-download-ftp  "&gnome-download-ftp;/gnome-system-monitor/&gnome-version;/gnome-system-monitor-&gnome-system-monitor-version;.tar.bz2">
+  <!ENTITY gnome-system-monitor-download-http "&gnome-download-http;/gnome-system-monitor/&gnome-old-version;/gnome-system-monitor-&gnome-system-monitor-version;.tar.bz2">
+  <!ENTITY gnome-system-monitor-download-ftp  "&gnome-download-ftp;/gnome-system-monitor/&gnome-old-version;/gnome-system-monitor-&gnome-system-monitor-version;.tar.bz2">
   <!ENTITY gnome-system-monitor-md5sum        "860047e636522af2c068dddb5df883bd">
   <!ENTITY gnome-system-monitor-size          "1.7 MB">
Index: gnome/add/gnome-utils.xml
===================================================================
--- gnome/add/gnome-utils.xml	(revision 6d0910f1c6e673cf073453d94e780c9acf8e35fd)
+++ gnome/add/gnome-utils.xml	(revision 8b158789c2b2a1583cf05cb6d44764462b0422e8)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gnome-utils-download-http "&gnome-download-http;/gnome-utils/&gnome-version;/gnome-utils-&gnome-utils-version;.tar.bz2">
-  <!ENTITY gnome-utils-download-ftp  "&gnome-download-ftp;/gnome-utils/&gnome-version;/gnome-utils-&gnome-utils-version;.tar.bz2">
+  <!ENTITY gnome-utils-download-http "&gnome-download-http;/gnome-utils/&gnome-old-version;/gnome-utils-&gnome-utils-version;.tar.bz2">
+  <!ENTITY gnome-utils-download-ftp  "&gnome-download-ftp;/gnome-utils/&gnome-old-version;/gnome-utils-&gnome-utils-version;.tar.bz2">
   <!ENTITY gnome-utils-md5sum        "10e8bd928d099a0d1f70919c8b7b7784">
   <!ENTITY gnome-utils-size          "4.0 MB">
Index: gnome/add/libgnomeprint.xml
===================================================================
--- gnome/add/libgnomeprint.xml	(revision 6d0910f1c6e673cf073453d94e780c9acf8e35fd)
+++ gnome/add/libgnomeprint.xml	(revision 8b158789c2b2a1583cf05cb6d44764462b0422e8)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY libgnomeprint-download-http "&gnome-download-http;/libgnomeprint/&gnome-version;/libgnomeprint-&libgnomeprint-version;.tar.bz2">
-  <!ENTITY libgnomeprint-download-ftp  "&gnome-download-ftp;/libgnomeprint/&gnome-version;/libgnomeprint-&libgnomeprint-version;.tar.bz2">
+  <!ENTITY libgnomeprint-download-http "&gnome-download-http;/libgnomeprint/&gnome-old-version;/libgnomeprint-&libgnomeprint-version;.tar.bz2">
+  <!ENTITY libgnomeprint-download-ftp  "&gnome-download-ftp;/libgnomeprint/&gnome-old-version;/libgnomeprint-&libgnomeprint-version;.tar.bz2">
   <!ENTITY libgnomeprint-md5sum        "5bfc42d67cae1148d1faf238185cbf4d">
   <!ENTITY libgnomeprint-size          "830 KB">
Index: gnome/add/libgnomeprintui.xml
===================================================================
--- gnome/add/libgnomeprintui.xml	(revision 6d0910f1c6e673cf073453d94e780c9acf8e35fd)
+++ gnome/add/libgnomeprintui.xml	(revision 8b158789c2b2a1583cf05cb6d44764462b0422e8)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY libgnomeprintui-download-http "&gnome-download-http;/libgnomeprintui/&gnome-version;/libgnomeprintui-&libgnomeprintui-version;.tar.bz2">
-  <!ENTITY libgnomeprintui-download-ftp  "&gnome-download-ftp;/libgnomeprintui/&gnome-version;/libgnomeprintui-&libgnomeprintui-version;.tar.bz2">
+  <!ENTITY libgnomeprintui-download-http "&gnome-download-http;/libgnomeprintui/&gnome-old-version;/libgnomeprintui-&libgnomeprintui-version;.tar.bz2">
+  <!ENTITY libgnomeprintui-download-ftp  "&gnome-download-ftp;/libgnomeprintui/&gnome-old-version;/libgnomeprintui-&libgnomeprintui-version;.tar.bz2">
   <!ENTITY libgnomeprintui-md5sum        "bea9871059cabee9d108bab32d58d2af">
   <!ENTITY libgnomeprintui-size          "656 KB">
Index: gnome/add/nautilus-cd-burner.xml
===================================================================
--- gnome/add/nautilus-cd-burner.xml	(revision 6d0910f1c6e673cf073453d94e780c9acf8e35fd)
+++ gnome/add/nautilus-cd-burner.xml	(revision 8b158789c2b2a1583cf05cb6d44764462b0422e8)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY nautilus-cd-burner-download-http "&gnome-download-http;/nautilus-cd-burner/&gnome-version;/nautilus-cd-burner-&nautilus-cd-burner-version;.tar.bz2">
-  <!ENTITY nautilus-cd-burner-download-ftp  "&gnome-download-http;/nautilus-cd-burner/&gnome-version;/nautilus-cd-burner-&nautilus-cd-burner-version;.tar.bz2">
+  <!ENTITY nautilus-cd-burner-download-http "&gnome-download-http;/nautilus-cd-burner/&gnome-old-version;/nautilus-cd-burner-&nautilus-cd-burner-version;.tar.bz2">
+  <!ENTITY nautilus-cd-burner-download-ftp  "&gnome-download-http;/nautilus-cd-burner/&gnome-old-version;/nautilus-cd-burner-&nautilus-cd-burner-version;.tar.bz2">
   <!ENTITY nautilus-cd-burner-md5sum        "fee9ec2f398a6b1eacfd59e239d06837">
   <!ENTITY nautilus-cd-burner-size          "740 KB">
Index: gnome/add/obsolete/ggv.xml
===================================================================
--- gnome/add/obsolete/ggv.xml	(revision 6d0910f1c6e673cf073453d94e780c9acf8e35fd)
+++ gnome/add/obsolete/ggv.xml	(revision 8b158789c2b2a1583cf05cb6d44764462b0422e8)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY ggv-download-http "http://ftp.gnome.org/pub/GNOME/sources/ggv/&gnome-version;/ggv-&ggv-version;.tar.bz2">
-  <!ENTITY ggv-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/ggv/&gnome-version;/ggv-&ggv-version;.tar.bz2">
+  <!ENTITY ggv-download-http "http://ftp.gnome.org/pub/GNOME/sources/ggv/&gnome-old-version;/ggv-&ggv-version;.tar.bz2">
+  <!ENTITY ggv-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/ggv/&gnome-old-version;/ggv-&ggv-version;.tar.bz2">
   <!ENTITY ggv-md5sum        "418f0ef3f8b82bb0c423a2a1cf6769f7">
   <!ENTITY ggv-size          "1.0 MB">
Index: gnome/add/obsolete/gpdf.xml
===================================================================
--- gnome/add/obsolete/gpdf.xml	(revision 6d0910f1c6e673cf073453d94e780c9acf8e35fd)
+++ gnome/add/obsolete/gpdf.xml	(revision 8b158789c2b2a1583cf05cb6d44764462b0422e8)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY gpdf-download-http "http://ftp.gnome.org/pub/GNOME/sources/gpdf/&gnome-version;/gpdf-&gpdf-version;.tar.bz2">
-  <!ENTITY gpdf-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gpdf/&gnome-version;/gpdf-&gpdf-version;.tar.bz2">
+  <!ENTITY gpdf-download-http "http://ftp.gnome.org/pub/GNOME/sources/gpdf/&gnome-old-version;/gpdf-&gpdf-version;.tar.bz2">
+  <!ENTITY gpdf-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gpdf/&gnome-old-version;/gpdf-&gpdf-version;.tar.bz2">
   <!ENTITY gpdf-md5sum "9278cd3b9d06e3b1d364452f0e512fa9">
   <!ENTITY gpdf-size "1.0 MB">
Index: gnome/add/orca.xml
===================================================================
--- gnome/add/orca.xml	(revision 6d0910f1c6e673cf073453d94e780c9acf8e35fd)
+++ gnome/add/orca.xml	(revision 8b158789c2b2a1583cf05cb6d44764462b0422e8)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY orca-download-http "&gnome-download-http;/orca/2.18/orca-&orca-version;.tar.bz2">
-  <!ENTITY orca-download-ftp  "&gnome-download-ftp;/orca/2.18/orca-&orca-version;.tar.bz2">
+  <!ENTITY orca-download-http "&gnome-download-http;/orca/&gnome-old-version;/orca-&orca-version;.tar.bz2">
+  <!ENTITY orca-download-ftp  "&gnome-download-ftp;/orca/&gnome-old-version;/orca-&orca-version;.tar.bz2">
   <!ENTITY orca-md5sum        "764f170af318c3ffd63b9cdfdcd19248">
   <!ENTITY orca-size          "934 KB">
Index: gnome/add/totem.xml
===================================================================
--- gnome/add/totem.xml	(revision 6d0910f1c6e673cf073453d94e780c9acf8e35fd)
+++ gnome/add/totem.xml	(revision 8b158789c2b2a1583cf05cb6d44764462b0422e8)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY totem-download-http "&gnome-download-http;/totem/&gnome-version;/totem-&totem-version;.tar.bz2">
-  <!ENTITY totem-download-ftp  "&gnome-download-ftp;/totem/&gnome-version;/totem-&totem-version;.tar.bz2">
+  <!ENTITY totem-download-http "&gnome-download-http;/totem/&gnome-old-version;/totem-&totem-version;.tar.bz2">
+  <!ENTITY totem-download-ftp  "&gnome-download-ftp;/totem/&gnome-old-version;/totem-&totem-version;.tar.bz2">
   <!ENTITY totem-md5sum        "a77ca6f0c56b2fc6ececd8158bb0cdca">
   <!ENTITY totem-size          "2.0 MB">
Index: gnome/add/zenity.xml
===================================================================
--- gnome/add/zenity.xml	(revision 6d0910f1c6e673cf073453d94e780c9acf8e35fd)
+++ gnome/add/zenity.xml	(revision 8b158789c2b2a1583cf05cb6d44764462b0422e8)
@@ -5,6 +5,6 @@
   %general-entities;
 
-  <!ENTITY zenity-download-http "&gnome-download-http;/zenity/&gnome-version;/zenity-&zenity-version;.tar.bz2">
-  <!ENTITY zenity-download-ftp  "&gnome-download-ftp;/zenity/&gnome-version;/zenity-&zenity-version;.tar.bz2">
+  <!ENTITY zenity-download-http "&gnome-download-http;/zenity/&gnome-old-version;/zenity-&zenity-version;.tar.bz2">
+  <!ENTITY zenity-download-ftp  "&gnome-download-ftp;/zenity/&gnome-old-version;/zenity-&zenity-version;.tar.bz2">
   <!ENTITY zenity-md5sum        "6eb60cebdfddd7f9ad302d0b5477382e">
   <!ENTITY zenity-size          "1.7 MB">
