diff --git a/pkgs/os-specific/linux/zen-kernel/2.6.31-zen1.nix b/pkgs/os-specific/linux/zen-kernel/2.6.31-zen1.nix
new file mode 100644
index 000000000000..9296bb54d0b4
--- /dev/null
+++ b/pkgs/os-specific/linux/zen-kernel/2.6.31-zen1.nix
@@ -0,0 +1,96 @@
+a :  
+let 
+  s = import ./src-for-2.6.31-zen1.nix;
+in 
+(import ../kernel/generic.nix) (rec {
+  inherit (a) stdenv fetchurl perl mktemp module_init_tools;
+
+  src = a.builderDefs.fetchGitFromSrcInfo s;
+  version = "2.6.31-zen1";
+  config = "./kernel-config";
+  features = {
+    iwlwifi = true;
+    zen = true;
+    fbConDecor = true;
+    aufs = true;
+  };
+
+  extraMeta = {
+    maintainers = [
+      a.lib.maintainers.raskin
+    ];
+    platforms = with a.lib.platforms; 
+      linux;
+  };
+
+  preConfigure = '' 
+    killOption () {
+      sed -re 's/^('"$1"')=.*/# \1 is not set/' -i .config
+    }
+    setOptionVal () {
+      sed -re 's/^('"$1"')=.*/\1='"$2"'/' -i .config
+      sed -re 's/^# ('"$1"') is not set/\1='"$2"'/' -i .config
+      sed -re "1i$1=$2" -i .config
+    }
+    setOptionMod () {
+      setOptionVal "$1" m
+    }
+    setOptionYes () {
+      setOptionVal "$1" y
+    }
+
+    make allmodconfig
+
+    killOption CONFIG_CMDLINE_OVERRIDE
+
+    killOption 'CONFIG_.*_DEBUG.*'
+    killOption 'CONFIG_DEBUG.*'
+    killOption CONFIG_AUDIT_ARCH
+    killOption CONFIG_PERF_COUNTERS
+    killOption 'CONFIG_GCOV.*'
+    killOption 'CONFIG_KGDB.*'
+    killOption 'CONFIG_.*_TEST'
+    killOption CONFIG_TASKSTATS
+
+    killOption CONFIG_SLQB
+    killOption CONFIG_SLQB_ALLOCATOR
+    setOptionYes CONFIG_SLUB_ALLOCATOR
+    setOptionYes CONFIG_SLUB
+    killOption CONFIG_ACPI_CUSTOM_DSDT_INITRD
+    killOption CONFIG_DEVTMPFS
+    killOption CONFIG_DEVTMPFS_MOUNT
+
+    killOption CONFIG_IMA
+  '' +
+  ''
+    killOption CONFIG_KERNEL_BZIP2
+    killOption CONFIG_KERNEL_LZMA
+    setOptionYes CONFIG_KERNEL_GZIP
+  ''+
+  ''
+    killOption CONFIG_FB_TILEBLITTING
+    killOption CONFIG_FB_S3
+    killOption CONFIG_FB_VT8623
+    killOption CONFIG_FB_ARK
+    setOptionYes CONFIG_FRAMEBUFFER_CONSOLE
+    setOptionYes CONFIG_FB
+    make oldconfig
+    setOptionYes CONFIG_FB_CON_DECOR
+    setOptionYes CONFIG_FB_VESA
+  ''+
+  ''
+    killOption CONFIG_PREEMPT_NONE
+    setOptionYes CONFIG_PREEMPT_VOLUNTARY
+  ''+
+  (if a.lib.attrByPath ["ckSched"] false a then ''
+    killOption CONFIG_CPU_CFS
+    setOptionYes CONFIG_CPU_BFS
+    killOption CONFIG_NO_HZ
+    killOption CONFIG_HZ_1000
+    setOptionYes CONFIG_HZ_250
+    setOptionVal CONFIG_HZ 250
+  ''else "") +
+  ''
+    cp .config ${config}
+  '';
+})
diff --git a/pkgs/os-specific/linux/zen-kernel/src-for-2.6.31-zen1.nix b/pkgs/os-specific/linux/zen-kernel/src-for-2.6.31-zen1.nix
new file mode 100644
index 000000000000..1f1872fa4def
--- /dev/null
+++ b/pkgs/os-specific/linux/zen-kernel/src-for-2.6.31-zen1.nix
@@ -0,0 +1,9 @@
+rec {
+   version="6530055a9a4e32e7a0e3dd0fa85f032f8d6c3020";
+   name="zen-linux-6530055a9a4e32e7a0e3dd0fa85f032f8d6c3020";
+   hash="08cef774b433d9e41b71c4f43308bb1da112960f5d272aeca2e0e0d10bacc779";
+   rev="6530055a9a4e32e7a0e3dd0fa85f032f8d6c3020";
+   url="http://git.zen-sources.org/zen.git";
+  
+  
+}
diff --git a/pkgs/os-specific/linux/zen-kernel/src-info-for-2.6.31-zen-any.nix b/pkgs/os-specific/linux/zen-kernel/src-info-for-2.6.31-zen-any.nix
new file mode 100644
index 000000000000..72b7dea1fb62
--- /dev/null
+++ b/pkgs/os-specific/linux/zen-kernel/src-info-for-2.6.31-zen-any.nix
@@ -0,0 +1,6 @@
+{
+  repoUrl = "http://git.zen-sources.org/zen.git";
+  rev = "origin/master-2.6.31";
+  baseName = "zen-linux";
+  method = "fetchgit";
+}
diff --git a/pkgs/os-specific/linux/zen-kernel/src-info-for-2.6.31-zen1.nix b/pkgs/os-specific/linux/zen-kernel/src-info-for-2.6.31-zen1.nix
new file mode 100644
index 000000000000..72b7dea1fb62
--- /dev/null
+++ b/pkgs/os-specific/linux/zen-kernel/src-info-for-2.6.31-zen1.nix
@@ -0,0 +1,6 @@
+{
+  repoUrl = "http://git.zen-sources.org/zen.git";
+  rev = "origin/master-2.6.31";
+  baseName = "zen-linux";
+  method = "fetchgit";
+}