diff --git a/pkgs/os-specific/linux/spl/spl-0.6.0.nix b/pkgs/os-specific/linux/spl/spl-0.6.0.nix
new file mode 100644
index 000000000000..c174daad26b5
--- /dev/null
+++ b/pkgs/os-specific/linux/spl/spl-0.6.0.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchgit, kernel, linuxHeaders, perl }:
+
+stdenv.mkDerivation {
+  name = "spl-0.6.0-rc4";
+  src = fetchgit {
+    url = git://github.com/behlendorf/spl.git;
+    rev = "dde6b7b137f56894a457";
+    sha256 = "c402517a647de0c22a69588219aa214f96d1cf9d2f8751b99c5a2795898c726b";
+  };
+
+  patches = [ ./install_prefix.patch ./module_prefix.patch ];
+
+  buildInputs = [ perl kernel linuxHeaders ];
+
+  configureFlags = [ "--with-linux=${kernel}/lib/modules/${kernel.version}/build" 
+                     "--with-linux-obj=${kernel}/lib/modules/${kernel.version}/build" ];
+
+  meta = {
+    description = "Kernel module driver for solaris porting layer (needed by in-kernel zfs)";
+    homepage = http://zfsonlinux.org/;
+    license = "CDDL";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix b/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix
new file mode 100644
index 000000000000..1cc923f39d16
--- /dev/null
+++ b/pkgs/os-specific/linux/zfs/zfs-0.6.0.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchgit, kernel, linuxHeaders, spl, perl, zlib, libuuid }:
+
+stdenv.mkDerivation {
+  name = "zfs-0.6.0-rc4";
+  src = fetchgit {
+    url = git://github.com/behlendorf/zfs.git;
+    rev = "3613204cd7e3ab1ae658";
+    sha256 = "217ca162b1b0178dd2e3acc543d3c0cce3a7be7e884a9118ffa0a84d3cbc73f5";
+  };
+
+  patches = [ ./module_perm_prefix.patch ./mount_zfs_prefix.patch ./kerneldir_path.patch ];
+
+  buildInputs = [ kernel linuxHeaders spl perl zlib libuuid];
+
+  configureFlags = " --with-linux=${kernel}/lib/modules/${kernel.version}/build --with-linux-obj=${kernel}/lib/modules/${kernel.version}/build --with-spl=${spl}/libexec/spl-0.6.0/${kernel.version}";
+
+  meta = {
+    description = "Native ZFS for Linux";
+    homepage = http://zfsonlinux.org/;
+    license = "CDDL";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}