diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix
new file mode 100644
index 000000000000..bc3fae3d4777
--- /dev/null
+++ b/pkgs/tools/security/fprintd/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, libfprint, intltool, glib, dbus_glib, polkit, nss, pam, systemd }:
+
+stdenv.mkDerivation rec {
+  name = "fprintd-0.5.1";
+
+  src = fetchurl {
+    url = "http://people.freedesktop.org/~hadess/${name}.tar.xz";
+    sha256 = "0n3fh28cvqrhjig30lz1p075g0wd7jnhvz1j34n37c0cwc7rfmlj";
+  };
+
+  patches = [ ./pod.patch ];
+
+  buildInputs = [ libfprint glib dbus_glib polkit nss pam systemd ];
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  configureFlags = [ "--with-systemdsystemunitdir=$(out)/lib/systemd/system" ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://www.freedesktop.org/wiki/Software/fprint/fprintd/";
+    description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/tools/security/fprintd/pod.patch b/pkgs/tools/security/fprintd/pod.patch
new file mode 100644
index 000000000000..34cf6560cc54
--- /dev/null
+++ b/pkgs/tools/security/fprintd/pod.patch
@@ -0,0 +1,9 @@
+diff -u -r fprintd-0.5.1/data/fprintd.pod fprintd-0.5.1-pod/data/fprintd.pod
+--- fprintd-0.5.1/data/fprintd.pod	2013-06-26 13:10:17.000000000 +0200
++++ fprintd-0.5.1-pod/data/fprintd.pod	2013-08-17 12:17:36.330332635 +0200
+@@ -100,3 +100,5 @@
+ =over 8
+ 
+ =item B<dbus-daemon>, B<gnome-about-me>
++
++=back
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e45f4043f825..9b01b6fae61b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1218,6 +1218,8 @@ let
 
   fprot = callPackage ../tools/security/fprot { };
 
+  fprintd = callPackage ../tools/security/fprintd { };
+
   freeipmi = callPackage ../tools/system/freeipmi {};
 
   freetalk = callPackage ../applications/networking/instant-messengers/freetalk {