diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix
new file mode 100644
index 000000000000..f7fee0705d94
--- /dev/null
+++ b/pkgs/os-specific/linux/cryptsetup/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, e2fsprogs, popt, devicemapper, udev }:
+
+stdenv.mkDerivation {
+  name = "cryptsetup-1.0.6";
+  src = fetchurl {
+    url = http://cryptsetup.googlecode.com/files/cryptsetup-1.0.6.tar.bz2;
+    sha256 = "df7fda80cfa01f063caf39140287a47d018dfe056fc71a3ba605e690ff0183fd";
+  };
+
+  configureFlags = [ "--enable-libdevmapper" ];
+
+  patchPhase = ''
+    sed -i -e 's@/sbin/udevsettle@${udev}/sbin/udevsettle@' lib/libdevmapper.c
+  '';
+
+  buildInputs = [ e2fsprogs popt devicemapper ];
+
+  meta = {
+    homepage = http://code.google.com/p/cryptsetup/;
+    description = "LUKS for dm-crypt";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c79c820947c..f7e0291e0685 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6519,6 +6519,10 @@ let
     inherit fetchurl stdenv zlibStatic;
   };
 
+  cryptsetup = import ../os-specific/linux/cryptsetup {
+    inherit stdenv fetchurl e2fsprogs popt devicemapper udev;
+  };
+
   cramfsswap = import ../os-specific/linux/cramfsswap {
     inherit fetchurl stdenv zlib;
   };