diff --git a/pkgs/tools/misc/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix
similarity index 98%
rename from pkgs/tools/misc/pinentry/default.nix
rename to pkgs/tools/security/pinentry/default.nix
index b9866878b7a8..524a582fcb02 100644
--- a/pkgs/tools/misc/pinentry/default.nix
+++ b/pkgs/tools/security/pinentry/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   buildNativeInputs = [ pkgconfig ];
 
-  meta = { 
+  meta = {
     description = "GnuPG's interface to passphrase input";
 
     longDescription = ''
diff --git a/pkgs/tools/misc/pinentry/duplicate-glib-defs.patch b/pkgs/tools/security/pinentry/duplicate-glib-defs.patch
similarity index 100%
rename from pkgs/tools/misc/pinentry/duplicate-glib-defs.patch
rename to pkgs/tools/security/pinentry/duplicate-glib-defs.patch
diff --git a/pkgs/tools/misc/polkit-gnome/default.nix b/pkgs/tools/security/polkit-gnome/default.nix
similarity index 100%
rename from pkgs/tools/misc/polkit-gnome/default.nix
rename to pkgs/tools/security/polkit-gnome/default.nix
diff --git a/pkgs/tools/security/polkit-kde-agent/default.nix b/pkgs/tools/security/polkit-kde-agent/default.nix
new file mode 100644
index 000000000000..eff290f54fa8
--- /dev/null
+++ b/pkgs/tools/security/polkit-kde-agent/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, kdelibs, polkit_qt_1, gettext }:
+
+stdenv.mkDerivation rec {
+  name = "polkit-kde-agent-1-0.99.0";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/apps/KDE4.x/admin/${name}.tar.bz2";
+    sha256 = "0rxlq6x0vhvha8i6w109zpzzacp4imins55v4p4fq7a3k0kgywg3";
+  };
+
+  buildInputs = [ kdelibs polkit_qt_1 ];
+
+  buildNativeInputs = [ gettext ];
+
+  patchPhase = "sed -e s/KDE4_AUTOSTART/AUTOSTART/ -i CMakeLists.txt";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fbe8fed5e604..3e7ad08989bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1142,7 +1142,7 @@ let
 
   philter = callPackage ../tools/networking/philter { };
 
-  pinentry = callPackage ../tools/misc/pinentry {
+  pinentry = callPackage ../tools/security/pinentry {
     inherit (gnome) glib gtk;
   };
 
@@ -1160,7 +1160,9 @@ let
 
   polipo = callPackage ../servers/polipo { };
 
-  polkit_gnome = callPackage ../tools/misc/polkit-gnome { };
+  polkit_gnome = callPackage ../tools/security/polkit-gnome { };
+
+  polkit_kde_agent = newScope pkgs.kde4 ../tools/security/polkit-kde-agent { };
 
   povray = callPackage ../tools/graphics/povray { };