diff --git a/pkgs/desktops/kde-4.6/default.nix b/pkgs/desktops/kde-4.6/default.nix
index db464b11c6e5..7c1cb65d9aa9 100644
--- a/pkgs/desktops/kde-4.6/default.nix
+++ b/pkgs/desktops/kde-4.6/default.nix
@@ -139,7 +139,6 @@ rec {
     printer_applet = callPackage ./utils/printer-applet.nix { };
     superkaramba = callPackage ./utils/superkaramba.nix { };
     sweeper = callPackage ./utils/sweeper.nix { };
-    wacomtablet = callPackage ./utils/wacomtablet.nix { };
   };
 
   kdewebdev = combinePkgs "kdewebdev" {
diff --git a/pkgs/desktops/kde-4.6/pim-runtime/default.nix b/pkgs/desktops/kde-4.6/pim-runtime/default.nix
index 38f115e66e7b..ccdecd46f38b 100644
--- a/pkgs/desktops/kde-4.6/pim-runtime/default.nix
+++ b/pkgs/desktops/kde-4.6/pim-runtime/default.nix
@@ -1,24 +1,25 @@
 { kde, fetchurl, cmake, qt4, perl, libxml2, libxslt, boost, shared_mime_info
-, kdelibs, kdepimlibs
+, kdelibs, kdepimlibs, gettext
 , automoc4, phonon, akonadi, soprano, strigi}:
 
 kde.package rec {
-  buildInputs = [ cmake qt4 perl libxml2 libxslt boost shared_mime_info
-                  kdelibs kdepimlibs
-		  automoc4 phonon akonadi soprano strigi ];
-  prePatch = ''
-      find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION \''${KDE4_DBUS_INTERFACES_DIR}@DESTINATION \''${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@"
-  '';
+  name = with meta.kde; "${module}-${release}";
+
+  buildInputs = [ cmake qt4 perl libxml2 libxslt boost shared_mime_info kdelibs
+    kdepimlibs automoc4 phonon akonadi soprano strigi gettext ];
 
   src = fetchurl {
-    url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.module}-${meta.kde.version}.tar.bz2";
-    sha256 = "029a0i83b2yrc1xn9as7gc9rakpxjh5cjmqcmhrrj0xwalqz490n";
+    url = "mirror://kde/unstable/kdepim/${meta.kde.release}/src/${name}.tar.bz2";
+    sha256 = "0gsp1yycjb7a3p285yqhs6v9rsrpbq0wfq3jhz7ky306692lrxig";
   };
 
   meta = {
     description = "KDE PIM runtime";
     homepage = http://www.kde.org;
     license = "GPL";
-    kde.module = "kdepim-runtime";
+    kde = {
+      release = "4.5.94.1";
+      module = "kdepim-runtime";
+    };
   };
 }
diff --git a/pkgs/desktops/kde-4.6/pim/default.nix b/pkgs/desktops/kde-4.6/pim/default.nix
index 55712ae5a72a..72734ff9c34d 100644
--- a/pkgs/desktops/kde-4.6/pim/default.nix
+++ b/pkgs/desktops/kde-4.6/pim/default.nix
@@ -1,22 +1,20 @@
 { kde, fetchurl, cmake, perl, boost, gpgme, libassuan, libgpgerror, libxslt
 , shared_mime_info, libXScrnSaver, kdelibs, kdepimlibs, kdepim_runtime
-, automoc4, akonadi, qca2}:
+, automoc4, akonadi, qca2, gettext, grantlee}:
 
 kde.package rec {
 
   buildInputs = [ cmake boost gpgme libassuan libgpgerror libxslt
-    shared_mime_info libXScrnSaver kdelibs kdepimlibs automoc4 akonadi ];
-  prePatch = ''
-      find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION \''${KDE4_DBUS_INTERFACES_DIR}@DESTINATION \''${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@"
-  '';
+    shared_mime_info libXScrnSaver kdelibs kdepimlibs automoc4 akonadi gettext
+    grantlee ];
   postInstall = ''
       mkdir -p $out/nix-support/
       echo ${akonadi} ${kdepimlibs} ${kdepim_runtime} > $out/nix-support/propagated-user-env-packages
   '';
 
   src = fetchurl {
-    url = "mirror://kde/stable/kdepim-${meta.kde.version}/src/${meta.kde.module}-${meta.kde.version}.tar.bz2";
-    sha256 = "02nbdn8s4504ljqz0qylm1jyw4hpg5fjw3vi6sbzm522xvkax4wh";
+    url = "mirror://kde/unstable/kdepim/${meta.kde.release}/src/${meta.kde.module}-${meta.kde.release}.tar.bz2";
+    sha256 = "1bnlyrflcjy7lj4c2jag212ws2gzzpqyn5g2p97x8y936dza7ic3";
   };
 
   meta = {
@@ -26,6 +24,9 @@ kde.package rec {
     '';
     license = "GPL";
     homepage = http://pim.kde.org;
-    kde.module = "kdepim";
+    kde = {
+      release = "4.5.94.1";
+      module = "kdepim";
+    };
   };
 }