diff --git a/pkgs/desktops/kde/kdebase/default.nix b/pkgs/desktops/kde-3/kdebase/default.nix
similarity index 100%
rename from pkgs/desktops/kde/kdebase/default.nix
rename to pkgs/desktops/kde-3/kdebase/default.nix
diff --git a/pkgs/desktops/kde/kdelibs/default.nix b/pkgs/desktops/kde-3/kdelibs/default.nix
similarity index 100%
rename from pkgs/desktops/kde/kdelibs/default.nix
rename to pkgs/desktops/kde-3/kdelibs/default.nix
diff --git a/pkgs/desktops/kde-4/base/builder.sh b/pkgs/desktops/kde-4-old/base/builder.sh
similarity index 100%
rename from pkgs/desktops/kde-4/base/builder.sh
rename to pkgs/desktops/kde-4-old/base/builder.sh
diff --git a/pkgs/desktops/kde-4/base/default.nix b/pkgs/desktops/kde-4-old/base/default.nix
similarity index 100%
rename from pkgs/desktops/kde-4/base/default.nix
rename to pkgs/desktops/kde-4-old/base/default.nix
diff --git a/pkgs/desktops/kde-4/decibel/default.nix b/pkgs/desktops/kde-4-old/decibel/default.nix
similarity index 100%
rename from pkgs/desktops/kde-4/decibel/default.nix
rename to pkgs/desktops/kde-4-old/decibel/default.nix
diff --git a/pkgs/desktops/kde-4/default.nix b/pkgs/desktops/kde-4-old/default.nix
similarity index 100%
rename from pkgs/desktops/kde-4/default.nix
rename to pkgs/desktops/kde-4-old/default.nix
diff --git a/pkgs/desktops/kde-4/edu/default.nix b/pkgs/desktops/kde-4-old/edu/default.nix
similarity index 100%
rename from pkgs/desktops/kde-4/edu/default.nix
rename to pkgs/desktops/kde-4-old/edu/default.nix
diff --git a/pkgs/desktops/kde-4/edu/myCmakeFiles/CheckBoostAndPythonCompatible.cmake b/pkgs/desktops/kde-4-old/edu/myCmakeFiles/CheckBoostAndPythonCompatible.cmake
similarity index 100%
rename from pkgs/desktops/kde-4/edu/myCmakeFiles/CheckBoostAndPythonCompatible.cmake
rename to pkgs/desktops/kde-4-old/edu/myCmakeFiles/CheckBoostAndPythonCompatible.cmake
diff --git a/pkgs/desktops/kde-4/edu/myCmakeFiles/FindBoostPython.cmake b/pkgs/desktops/kde-4-old/edu/myCmakeFiles/FindBoostPython.cmake
similarity index 100%
rename from pkgs/desktops/kde-4/edu/myCmakeFiles/FindBoostPython.cmake
rename to pkgs/desktops/kde-4-old/edu/myCmakeFiles/FindBoostPython.cmake
diff --git a/pkgs/desktops/kde-4/edu/myCmakeFiles/FindLibfacile.cmake b/pkgs/desktops/kde-4-old/edu/myCmakeFiles/FindLibfacile.cmake
similarity index 100%
rename from pkgs/desktops/kde-4/edu/myCmakeFiles/FindLibfacile.cmake
rename to pkgs/desktops/kde-4-old/edu/myCmakeFiles/FindLibfacile.cmake
diff --git a/pkgs/desktops/kde-4/edu/myCmakeFiles/PythonLibsUtils.cmake b/pkgs/desktops/kde-4-old/edu/myCmakeFiles/PythonLibsUtils.cmake
similarity index 100%
rename from pkgs/desktops/kde-4/edu/myCmakeFiles/PythonLibsUtils.cmake
rename to pkgs/desktops/kde-4-old/edu/myCmakeFiles/PythonLibsUtils.cmake
diff --git a/pkgs/desktops/kde-4/extragear/default.nix b/pkgs/desktops/kde-4-old/extragear/default.nix
similarity index 100%
rename from pkgs/desktops/kde-4/extragear/default.nix
rename to pkgs/desktops/kde-4-old/extragear/default.nix
diff --git a/pkgs/desktops/kde-4/games/default.nix b/pkgs/desktops/kde-4-old/games/default.nix
similarity index 100%
rename from pkgs/desktops/kde-4/games/default.nix
rename to pkgs/desktops/kde-4-old/games/default.nix
diff --git a/pkgs/desktops/kde-4/graphics/default.nix b/pkgs/desktops/kde-4-old/graphics/default.nix
similarity index 100%
rename from pkgs/desktops/kde-4/graphics/default.nix
rename to pkgs/desktops/kde-4-old/graphics/default.nix
diff --git a/pkgs/desktops/kde-4/libs/FindIlmBase.cmake b/pkgs/desktops/kde-4-old/libs/FindIlmBase.cmake
similarity index 100%
rename from pkgs/desktops/kde-4/libs/FindIlmBase.cmake
rename to pkgs/desktops/kde-4-old/libs/FindIlmBase.cmake
diff --git a/pkgs/desktops/kde-4/libs/FindOpenEXR.cmake b/pkgs/desktops/kde-4-old/libs/FindOpenEXR.cmake
similarity index 100%
rename from pkgs/desktops/kde-4/libs/FindOpenEXR.cmake
rename to pkgs/desktops/kde-4-old/libs/FindOpenEXR.cmake
diff --git a/pkgs/desktops/kde-4/libs/default.nix b/pkgs/desktops/kde-4-old/libs/default.nix
similarity index 100%
rename from pkgs/desktops/kde-4/libs/default.nix
rename to pkgs/desktops/kde-4-old/libs/default.nix
diff --git a/pkgs/desktops/kde-4/libs/setup.sh b/pkgs/desktops/kde-4-old/libs/setup.sh
similarity index 100%
rename from pkgs/desktops/kde-4/libs/setup.sh
rename to pkgs/desktops/kde-4-old/libs/setup.sh
diff --git a/pkgs/desktops/kde-4/multimedia/default.nix b/pkgs/desktops/kde-4-old/multimedia/default.nix
similarity index 100%
rename from pkgs/desktops/kde-4/multimedia/default.nix
rename to pkgs/desktops/kde-4-old/multimedia/default.nix
diff --git a/pkgs/desktops/kde-4/network/default.nix b/pkgs/desktops/kde-4-old/network/default.nix
similarity index 100%
rename from pkgs/desktops/kde-4/network/default.nix
rename to pkgs/desktops/kde-4-old/network/default.nix
diff --git a/pkgs/desktops/kde-4/pim/builder.sh b/pkgs/desktops/kde-4-old/pim/builder.sh
similarity index 100%
rename from pkgs/desktops/kde-4/pim/builder.sh
rename to pkgs/desktops/kde-4-old/pim/builder.sh
diff --git a/pkgs/desktops/kde-4/pim/default.nix b/pkgs/desktops/kde-4-old/pim/default.nix
similarity index 100%
rename from pkgs/desktops/kde-4/pim/default.nix
rename to pkgs/desktops/kde-4-old/pim/default.nix
diff --git a/pkgs/desktops/kde-4/pimlibs/default.nix b/pkgs/desktops/kde-4-old/pimlibs/default.nix
similarity index 100%
rename from pkgs/desktops/kde-4/pimlibs/default.nix
rename to pkgs/desktops/kde-4-old/pimlibs/default.nix
diff --git a/pkgs/desktops/kde-4/runtime/builder.sh b/pkgs/desktops/kde-4-old/runtime/builder.sh
similarity index 100%
rename from pkgs/desktops/kde-4/runtime/builder.sh
rename to pkgs/desktops/kde-4-old/runtime/builder.sh
diff --git a/pkgs/desktops/kde-4/runtime/default.nix b/pkgs/desktops/kde-4-old/runtime/default.nix
similarity index 100%
rename from pkgs/desktops/kde-4/runtime/default.nix
rename to pkgs/desktops/kde-4-old/runtime/default.nix
diff --git a/pkgs/desktops/kde-4/support/akode.nix b/pkgs/desktops/kde-4-old/support/akode.nix
similarity index 100%
rename from pkgs/desktops/kde-4/support/akode.nix
rename to pkgs/desktops/kde-4-old/support/akode.nix
diff --git a/pkgs/desktops/kde-4/support/default.nix b/pkgs/desktops/kde-4-old/support/default.nix
similarity index 100%
rename from pkgs/desktops/kde-4/support/default.nix
rename to pkgs/desktops/kde-4-old/support/default.nix
diff --git a/pkgs/desktops/kde-4/support/eigen.nix b/pkgs/desktops/kde-4-old/support/eigen.nix
similarity index 100%
rename from pkgs/desktops/kde-4/support/eigen.nix
rename to pkgs/desktops/kde-4-old/support/eigen.nix
diff --git a/pkgs/desktops/kde-4/support/gmm.nix b/pkgs/desktops/kde-4-old/support/gmm.nix
similarity index 100%
rename from pkgs/desktops/kde-4/support/gmm.nix
rename to pkgs/desktops/kde-4-old/support/gmm.nix
diff --git a/pkgs/desktops/kde-4/support/qca.nix b/pkgs/desktops/kde-4-old/support/qca.nix
similarity index 100%
rename from pkgs/desktops/kde-4/support/qca.nix
rename to pkgs/desktops/kde-4-old/support/qca.nix
diff --git a/pkgs/desktops/kde-4/support/qimageblitz.nix b/pkgs/desktops/kde-4-old/support/qimageblitz.nix
similarity index 100%
rename from pkgs/desktops/kde-4/support/qimageblitz.nix
rename to pkgs/desktops/kde-4-old/support/qimageblitz.nix
diff --git a/pkgs/desktops/kde-4/support/soprano.nix b/pkgs/desktops/kde-4-old/support/soprano.nix
similarity index 100%
rename from pkgs/desktops/kde-4/support/soprano.nix
rename to pkgs/desktops/kde-4-old/support/soprano.nix
diff --git a/pkgs/desktops/kde-4/support/strigi.nix b/pkgs/desktops/kde-4-old/support/strigi.nix
similarity index 100%
rename from pkgs/desktops/kde-4/support/strigi.nix
rename to pkgs/desktops/kde-4-old/support/strigi.nix
diff --git a/pkgs/desktops/kde-4/support/taglib.nix b/pkgs/desktops/kde-4-old/support/taglib.nix
similarity index 100%
rename from pkgs/desktops/kde-4/support/taglib.nix
rename to pkgs/desktops/kde-4-old/support/taglib.nix
diff --git a/pkgs/desktops/kde-4/toys/default.nix b/pkgs/desktops/kde-4-old/toys/default.nix
similarity index 100%
rename from pkgs/desktops/kde-4/toys/default.nix
rename to pkgs/desktops/kde-4-old/toys/default.nix
diff --git a/pkgs/desktops/kde-4/utils/default.nix b/pkgs/desktops/kde-4-old/utils/default.nix
similarity index 100%
rename from pkgs/desktops/kde-4/utils/default.nix
rename to pkgs/desktops/kde-4-old/utils/default.nix
diff --git a/pkgs/desktops/kde-4/workspace/builder.sh b/pkgs/desktops/kde-4-old/workspace/builder.sh
similarity index 100%
rename from pkgs/desktops/kde-4/workspace/builder.sh
rename to pkgs/desktops/kde-4-old/workspace/builder.sh
diff --git a/pkgs/desktops/kde-4/workspace/default.nix b/pkgs/desktops/kde-4-old/workspace/default.nix
similarity index 100%
rename from pkgs/desktops/kde-4/workspace/default.nix
rename to pkgs/desktops/kde-4-old/workspace/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9cfa7d11a7..c450f5bb605 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9161,15 +9161,28 @@ let
       xmlto docbook2x docbook_xsl intltool;
   });
 
-  kdelibs = import ../desktops/kde/kdelibs {
-    inherit
-      fetchurl stdenv xlibs zlib perl openssl pcre pkgconfig
-      libjpeg libpng libtiff libxml2 libxslt libtool
-      expat freetype bzip2 cups attr acl;
-    qt = qt3;
+  kde3 = {
+
+    kdelibs = import ../desktops/kde-3/kdelibs {
+      inherit
+        fetchurl stdenv xlibs zlib perl openssl pcre pkgconfig
+        libjpeg libpng libtiff libxml2 libxslt libtool
+        expat freetype bzip2 cups attr acl;
+      qt = qt3;
+    };
+
+    kdebase = import ../desktops/kde-3/kdebase {
+      inherit
+        fetchurl stdenv pkgconfig x11 xlibs zlib libpng libjpeg perl
+        kdelibs openssl bzip2 fontconfig pam hal dbus;
+      inherit (gtkLibs) glib;
+      qt = qt3;
+    };
+
   };
 
-  kde4 = recurseIntoAttrs (import ../desktops/kde-4 {
+  /*
+  kde4 = recurseIntoAttrs (import ../desktops/kde-4-old {
     inherit
       fetchurl fetchsvn zlib perl openssl pcre pkgconfig libjpeg libpng libtiff
       libxml2 libxslt libtool libusb expat freetype bzip2 cmake cluceneCore libgcrypt gnupg
@@ -9190,18 +9203,16 @@ let
     qt = qt4;
     openexr = openexr_1_6_1 ;
   });
+  */
+
+  kde4 = kde42;
 
   kde42 = import ../desktops/kde-4.2 (pkgs // {
     openexr = openexr_1_6_1;
   });
 
-  kdebase = import ../desktops/kde/kdebase {
-    inherit
-      fetchurl stdenv pkgconfig x11 xlibs zlib libpng libjpeg perl
-      kdelibs openssl bzip2 fontconfig pam hal dbus;
-    inherit (gtkLibs) glib;
-    qt = qt3;
-  };
+  kdelibs = kde3.kdelibs;
+  kdebase = kde3.kdebase;
 
   ### SCIENCE/GEOMETRY