diff --git a/pkgs/desktops/xfce-4.6/applications/mousepad.nix b/pkgs/desktops/xfce-4.6/applications/mousepad.nix
index 920151282a8..5912b21c766 100644
--- a/pkgs/desktops/xfce-4.6/applications/mousepad.nix
+++ b/pkgs/desktops/xfce-4.6/applications/mousepad.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "mousepad-0.2.16";
   
   src = fetchurl {
-    url = "http://www.xfce.org/archive/src/apps/mousepad/0.2/${name}.tar.bz2";
+    url = "http://archive.xfce.org/src/apps/mousepad/0.2/${name}.tar.bz2";
     sha1 = "4e63033e0a71578f3ec9a0d2e6a505efd0424ef9";
   };
 
diff --git a/pkgs/desktops/xfce-4.6/applications/ristretto.nix b/pkgs/desktops/xfce-4.6/applications/ristretto.nix
index 198421e21d3..aefabcb65fb 100644
--- a/pkgs/desktops/xfce-4.6/applications/ristretto.nix
+++ b/pkgs/desktops/xfce-4.6/applications/ristretto.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "ristretto-0.0.22";
   
   src = fetchurl {
-    url = "http://www.xfce.org/archive/src/apps/ristretto/0.0/${name}.tar.gz";
+    url = "http://archive.xfce.org/src/apps/ristretto/0.0/${name}.tar.gz";
     sha1 = "bddbc8618ba67699ccf5ee4ea0b538b1be7fdb0a";
   };
 
diff --git a/pkgs/desktops/xfce-4.6/applications/xfce4-power-manager.nix b/pkgs/desktops/xfce-4.6/applications/xfce4-power-manager.nix
index 543b7660975..65e906f5d83 100644
--- a/pkgs/desktops/xfce-4.6/applications/xfce4-power-manager.nix
+++ b/pkgs/desktops/xfce-4.6/applications/xfce4-power-manager.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "xfce4-power-manager-0.8.5";
   
   src = fetchurl {
-    url = "http://www.xfce.org/archive/src/apps/xfce4-power-manager/0.8/${name}.tar.bz2";
+    url = "http://archive.xfce.org/src/apps/xfce4-power-manager/0.8/${name}.tar.bz2";
     sha1 = "b1ce0f120733ec1a6267d50ba5c2990bbbbccfd4";
   };
 
diff --git a/pkgs/desktops/xfce-4.6/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce-4.6/art/xfce4-icon-theme.nix
index a17267a336c..f42790c6216 100644
--- a/pkgs/desktops/xfce-4.6/art/xfce4-icon-theme.nix
+++ b/pkgs/desktops/xfce-4.6/art/xfce4-icon-theme.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "xfce4-icon-theme-4.4.3";
   
   src = fetchurl {
-    url = "http://www.xfce.org/archive/src/art/xfce4-icon-theme/4.4/${name}.tar.bz2";
+    url = "http://archive.xfce.org/src/art/xfce4-icon-theme/4.4/${name}.tar.bz2";
     sha1 = "0c0d0c45cd4a7f609310db8e9d17c1c4a131a6e7";
   };
 
diff --git a/pkgs/desktops/xfce-4.6/core/exo.nix b/pkgs/desktops/xfce-4.6/core/exo.nix
index 53fc8fa8fcd..5115a402c0d 100644
--- a/pkgs/desktops/xfce-4.6/core/exo.nix
+++ b/pkgs/desktops/xfce-4.6/core/exo.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "exo-0.3.107";
   
   src = fetchurl {
-    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2";
     sha256 = "18z2xmdl577r60ln2waai10dd7i384k0bxrmf7gchrxd9c9aq4ha";
   };
 
diff --git a/pkgs/desktops/xfce-4.6/core/gtk-xfce-engine.nix b/pkgs/desktops/xfce-4.6/core/gtk-xfce-engine.nix
index bab382a263f..156da1c6483 100644
--- a/pkgs/desktops/xfce-4.6/core/gtk-xfce-engine.nix
+++ b/pkgs/desktops/xfce-4.6/core/gtk-xfce-engine.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "gtk-xfce-engine-2.6.0";
   
   src = fetchurl {
-    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2";
     sha1 = "a7be2f330833d150c5fb37f68a4c2138348b5446";
   };
 
diff --git a/pkgs/desktops/xfce-4.6/core/libxfce4menu.nix b/pkgs/desktops/xfce-4.6/core/libxfce4menu.nix
index f8a0c1ba87c..fda09979819 100644
--- a/pkgs/desktops/xfce-4.6/core/libxfce4menu.nix
+++ b/pkgs/desktops/xfce-4.6/core/libxfce4menu.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libxfce4menu-4.6.2";
   
   src = fetchurl {
-    url = "http://www.xfce.org/archive/xfce-4.6.2/src/${name}.tar.bz2";
+    url = "http://archive.xfce.org/xfce-4.6.2/src/${name}.tar.bz2";
     sha1 = "32a85c1ad31360347d5a2f240c4ddc08b444d124";
   };
 
diff --git a/pkgs/desktops/xfce-4.6/core/libxfce4util.nix b/pkgs/desktops/xfce-4.6/core/libxfce4util.nix
index 2625966bb58..ca90822cfd0 100644
--- a/pkgs/desktops/xfce-4.6/core/libxfce4util.nix
+++ b/pkgs/desktops/xfce-4.6/core/libxfce4util.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libxfce4util-4.6.2";
   
   src = fetchurl {
-    url = "http://www.xfce.org/archive/xfce-4.6.2/src/${name}.tar.bz2";
+    url = "http://archive.xfce.org/xfce-4.6.2/src/${name}.tar.bz2";
     sha256 = "10wcw7r8cjb0farffic037pcjr5bwrjrm8s3jrcb7c0b038pwbmf";
   };
 
diff --git a/pkgs/desktops/xfce-4.6/core/libxfcegui4.nix b/pkgs/desktops/xfce-4.6/core/libxfcegui4.nix
index 52ee3a6262f..056853f9eb1 100644
--- a/pkgs/desktops/xfce-4.6/core/libxfcegui4.nix
+++ b/pkgs/desktops/xfce-4.6/core/libxfcegui4.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "libxfcegui4-4.6.4";
   
   src = fetchurl {
-    url = "http://www.xfce.org/archive/xfce-4.6.2/src/${name}.tar.bz2";
+    url = "http://archive.xfce.org/xfce-4.6.2/src/${name}.tar.bz2";
     sha1 = "a12c79f8fa14c5d1fc0fca5615a451b7d23f8695";
   };
 
diff --git a/pkgs/desktops/xfce-4.6/core/thunar.nix b/pkgs/desktops/xfce-4.6/core/thunar.nix
index adbbd461c5e..2fecb7814b1 100644
--- a/pkgs/desktops/xfce-4.6/core/thunar.nix
+++ b/pkgs/desktops/xfce-4.6/core/thunar.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   name = "thunar-1.0.2";
   
   src = fetchurl {
-    url = http://www.xfce.org/archive/xfce/4.6.2/src/Thunar-1.0.2.tar.bz2;
+    url = http://archive.xfce.org/xfce/4.6.2/src/Thunar-1.0.2.tar.bz2;
     sha1 = "f7ae00c32402e4bc502aba15477b78e2c558c7c3";
   };
 
diff --git a/pkgs/desktops/xfce-4.6/core/xfce-utils.nix b/pkgs/desktops/xfce-4.6/core/xfce-utils.nix
index 4f520058ccf..ed2bfc56108 100644
--- a/pkgs/desktops/xfce-4.6/core/xfce-utils.nix
+++ b/pkgs/desktops/xfce-4.6/core/xfce-utils.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "xfce-utils-4.6.2";
   
   src = fetchurl {
-    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2";
     sha1 = "6373886c3d70e576859741bde747a235567ffd8e";
   };
 
diff --git a/pkgs/desktops/xfce-4.6/core/xfce4-panel.nix b/pkgs/desktops/xfce-4.6/core/xfce4-panel.nix
index b8a8c145801..7708d019b90 100644
--- a/pkgs/desktops/xfce-4.6/core/xfce4-panel.nix
+++ b/pkgs/desktops/xfce-4.6/core/xfce4-panel.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "xfce4-panel-4.6.4";
   
   src = fetchurl {
-    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2";
     sha1 = "d2b310c036be84ed9886c06ae35b7a1a8eabfcb8";
   };
 
diff --git a/pkgs/desktops/xfce-4.6/core/xfce4-session.nix b/pkgs/desktops/xfce-4.6/core/xfce4-session.nix
index dc563502542..fc56be085c4 100644
--- a/pkgs/desktops/xfce-4.6/core/xfce4-session.nix
+++ b/pkgs/desktops/xfce-4.6/core/xfce4-session.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "xfce4-session-4.6.2";
   
   src = fetchurl {
-    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2";
     sha1 = "2a5778a1543f97845f118a186e2dbb8a8ea3ff4b";
   };
 
diff --git a/pkgs/desktops/xfce-4.6/core/xfce4-settings.nix b/pkgs/desktops/xfce-4.6/core/xfce4-settings.nix
index b0bfadf8e52..0935955231e 100644
--- a/pkgs/desktops/xfce-4.6/core/xfce4-settings.nix
+++ b/pkgs/desktops/xfce-4.6/core/xfce4-settings.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "xfce4-settings-4.6.5";
   
   src = fetchurl {
-    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2";
     sha1 = "c036cc2f3100a46b2649e678dff7c0106b219263";
   };
 
diff --git a/pkgs/desktops/xfce-4.6/core/xfconf.nix b/pkgs/desktops/xfce-4.6/core/xfconf.nix
index b4c14ef043e..2fc88bd1258 100644
--- a/pkgs/desktops/xfce-4.6/core/xfconf.nix
+++ b/pkgs/desktops/xfce-4.6/core/xfconf.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "xfconf-4.6.2";
   
   src = fetchurl {
-    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2";
     sha1 = "2b9656a1b7f323d2600ddc929191afb50c8018f8";
   };
 
diff --git a/pkgs/desktops/xfce-4.6/core/xfdesktop.nix b/pkgs/desktops/xfce-4.6/core/xfdesktop.nix
index 83de4ed4dfe..90a69bd8692 100644
--- a/pkgs/desktops/xfce-4.6/core/xfdesktop.nix
+++ b/pkgs/desktops/xfce-4.6/core/xfdesktop.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "xfdesktop-4.6.2";
   
   src = fetchurl {
-    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2";
     sha1 = "cefcd1c1386d34386d4e900cbf88b7c24ef3bafb";
   };
 
diff --git a/pkgs/desktops/xfce-4.6/core/xfwm4.nix b/pkgs/desktops/xfce-4.6/core/xfwm4.nix
index c7bab240691..6e88ef9cd0d 100644
--- a/pkgs/desktops/xfce-4.6/core/xfwm4.nix
+++ b/pkgs/desktops/xfce-4.6/core/xfwm4.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "xfwm4-4.6.2";
   
   src = fetchurl {
-    url = "http://www.xfce.org/archive/xfce/4.6.2/src/${name}.tar.bz2";
+    url = "http://archive.xfce.org/xfce/4.6.2/src/${name}.tar.bz2";
     sha256 = "0a2q2pr5mzp6hsrd0llr90i9wii2qj2054shkpvkain20gp1ja11";
   };
 
diff --git a/pkgs/desktops/xfce-4.8/applications/mousepad.nix b/pkgs/desktops/xfce-4.8/applications/mousepad.nix
index ab4bea16f1c..395a5c9f084 100644
--- a/pkgs/desktops/xfce-4.8/applications/mousepad.nix
+++ b/pkgs/desktops/xfce-4.8/applications/mousepad.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "mousepad-0.2.16";
   
   src = fetchurl {
-    url = "http://www.xfce.org/archive/src/apps/mousepad/0.2/${name}.tar.bz2";
+    url = "http://archive.xfce.org/src/apps/mousepad/0.2/${name}.tar.bz2";
     sha1 = "4e63033e0a71578f3ec9a0d2e6a505efd0424ef9";
   };
 
diff --git a/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix
index d69a517b203..afa934b6031 100644
--- a/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix
+++ b/pkgs/desktops/xfce-4.8/art/xfce4-icon-theme.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "xfce4-icon-theme-4.4.3";
   
   src = fetchurl {
-    url = "http://www.xfce.org/archive/src/art/xfce4-icon-theme/4.4/${name}.tar.bz2";
+    url = "http://archive.xfce.org/src/art/xfce4-icon-theme/4.4/${name}.tar.bz2";
     sha1 = "0c0d0c45cd4a7f609310db8e9d17c1c4a131a6e7";
   };