diff --git a/pkgs/tools/security/omapd/default.nix b/pkgs/tools/security/omapd/default.nix
new file mode 100644
index 000000000000..ae1c2c05f147
--- /dev/null
+++ b/pkgs/tools/security/omapd/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, cmake, qt4, gdb, zlib }:
+stdenv.mkDerivation rec {
+
+  name = "omapd-${version}";
+  version = "0.9.2";
+
+  src = fetchurl {
+    url = "http://omapd.googlecode.com/files/${name}.tgz";
+    sha256 = "0d7lgv957jhbsav60j50jhdy3rpcqgql74qsniwnnpm3yqj9p0xc";
+  };
+
+  patches = [ ./zlib.patch ];
+
+  buildInputs = [ cmake qt4 zlib gdb ];
+
+  phases = [ "unpackPhase" "patchPhase" "buildPhase" "installPhase" ];
+
+  buildPhase = ''
+    (cd plugins/RAMHashTables; qmake; make)
+    qmake
+    make
+    '';
+
+  installPhase = ''
+    mkdir -p $out $out/bin $out/etc $out/usr/lib/omapd/plugins
+    cp omapd $out/bin/.
+    cp omapd.conf $out/etc/.
+    cp plugins/libRAMHashTables.so $out/usr/lib/omapd/plugins/.
+    ln -s $out/usr/lib/omapd/plugins $out/bin/plugins
+    '';
+
+  meta = with stdenv.lib; {
+    homepage = http://code.google.com/p/omapd;
+    description = "IF-MAP Server that implements the IF-MAP v1.1 and v2.0 specifications published by the Trusted Computing Group (TCG)";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.tstrobel ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/security/omapd/zlib.patch b/pkgs/tools/security/omapd/zlib.patch
new file mode 100644
index 000000000000..dc0644f2a016
--- /dev/null
+++ b/pkgs/tools/security/omapd/zlib.patch
@@ -0,0 +1,9 @@
+diff -uNr omapd-0.9.2-old/omapd.pro omapd-0.9.2/omapd.pro
+--- omapd-0.9.2-old/omapd.pro	2015-08-03 09:46:47.463420480 +0200
++++ omapd-0.9.2/omapd.pro	2015-08-03 09:48:32.238657105 +0200
+@@ -37,4 +37,4 @@
+     clientconfiguration.h \
+     managementserver.h \
+     json.h
+-INCLUDEPATH += $$[QT_INSTALL_PREFIX]/src/3rdparty/zlib
++LIBS += -lz
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 139f655110c8..8aea9803be46 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3134,6 +3134,8 @@ let
 
   trousers = callPackage ../tools/security/trousers { };
 
+  omapd = callPackage ../tools/security/omapd { };
+
   ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { };
 
   ttfautohint = callPackage ../tools/misc/ttfautohint { };