diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix
new file mode 100644
index 00000000000..80703990778
--- /dev/null
+++ b/pkgs/os-specific/linux/open-iscsi/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, kernel}:
+
+stdenv.mkDerivation rec {
+  name = "open-iscsi-2.0-871";
+  src = fetchurl {
+    url = "http://www.open-iscsi.org/bits/${name}.tar.gz";
+    sha256 = "1jvx1agybaj4czhz41bz37as076spicsmlh5pjksvwl2mr38gsmw";
+  };
+  
+  KSRC = "${kernel}/lib/modules/*/build";
+  DESTDIR="$(out)";
+  
+  preConfigure = ''
+    sed -i 's|/usr/|/|' Makefile
+  '';
+  
+  patches = [./kernel.patch];
+  
+  meta = {
+    description = "Open-iSCSI project is a high performance, transport independent, multi-platform implementation of RFC3720.";
+    license = "GPLv2+";
+    homepage = http://www.open-iscsi.org ;
+  };
+}
diff --git a/pkgs/os-specific/linux/open-iscsi/kernel.patch b/pkgs/os-specific/linux/open-iscsi/kernel.patch
new file mode 100644
index 00000000000..48dfa195400
--- /dev/null
+++ b/pkgs/os-specific/linux/open-iscsi/kernel.patch
@@ -0,0 +1,12 @@
+*** open-iscsi-2.0-871/kernel/Makefile	2009-07-11 05:55:58.000000000 +0200
+--- open-iscsi-2.0-871-new/kernel/Makefile	2010-08-30 11:37:56.000000000 +0200
+***************
+*** 101,106 ****
+--- 101,107 ----
+  linux_2_6_29: $(unpatch_code)
+  
+  linux_2_6_30: $(unpatch_code)
++ linux_2_6_32: $(unpatch_code)
+  
+  
+  do_unpatch_code:
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6dd77b7b476..c396792f9a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4607,6 +4607,8 @@ let
     nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { };
 
     openafsClient = callPackage ../servers/openafs-client { };
+    
+    openiscsi = callPackage ../os-specific/linux/open-iscsi { };
 
     wis_go7007 = callPackage ../os-specific/linux/wis-go7007 { };