diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.23.1.nix b/pkgs/os-specific/linux/kernel-headers/2.6.23.1.nix
new file mode 100644
index 000000000000..adaa303aa008
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel-headers/2.6.23.1.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchurl}:
+
+assert stdenv.isLinux;
+
+stdenv.mkDerivation {
+  name = "linux-headers-2.6.23.1";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v2.6/linux-2.6.23.1.tar.bz2";
+    sha256 = "0737g83h7jbrlss8782b17mhc3nfn8qfbh5s71flz8pjxmbbmg1m";
+  };
+
+  platform = 
+    if stdenv.system == "i686-linux" then "i386" else
+    if stdenv.system == "x86_64-linux" then "x86_64" else
+    if stdenv.system == "powerpc-linux" then "powerpc" else
+    abort "don't know what the kernel include directory is called for this platform";
+
+  extraIncludeDirs =
+    if stdenv.system == "powerpc-linux" then ["ppc"] else [];
+}
diff --git a/pkgs/os-specific/linux/kvm/49.nix b/pkgs/os-specific/linux/kvm/49.nix
new file mode 100644
index 000000000000..b49ba450969c
--- /dev/null
+++ b/pkgs/os-specific/linux/kvm/49.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchurl, kernelHeaders, zlib, e2fsprogs, SDL, alsaLib}:
+   
+assert stdenv.isLinux;
+   
+stdenv.mkDerivation {
+  name = "kvm-49";
+   
+  src = fetchurl {
+    url = mirror://sourceforge/kvm/kvm-49.tar.gz;
+    sha256 = "0ml7dlxg6alhrhdlp83j53bpwlbn3nfl8dga5jrmhaqmzpx4d8kp";
+  };
+
+  configureFlags = "--with-patched-kernel --kerneldir=${kernelHeaders}";
+
+  # e2fsprogs is needed for libuuid.
+  buildInputs = [zlib e2fsprogs SDL alsaLib];
+
+  preConfigure = "for i in configure user/configure; do substituteInPlace $i --replace /bin/bash $shell; done";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa39c8f260d5..dfb7a0e32185 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2813,6 +2813,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  kernelHeaders_2_6_23 = import ../os-specific/linux/kernel-headers/2.6.23.1.nix {
+    inherit fetchurl stdenv;
+  };
+
   kernelHeadersArm = import ../os-specific/linux/kernel-headers-cross {
     inherit fetchurl stdenv;
     cross = "arm-linux";
@@ -2992,7 +2996,7 @@ rec {
 	kernel = systemKernel;
   };
 
-  kvm = kvm12;
+  kvm = kvm49;
 
   kvm12 = import ../os-specific/linux/kvm/12.nix {
     inherit fetchurl zlib e2fsprogs SDL alsaLib;
@@ -3006,6 +3010,12 @@ rec {
     kernelHeaders = kernelHeaders_2_6_21;
   };
 
+  kvm49 = import ../os-specific/linux/kvm/49.nix {
+    inherit fetchurl zlib e2fsprogs SDL alsaLib;
+    stdenv = overrideGCC stdenv gcc34;
+    kernelHeaders = kernelHeaders_2_6_23;
+  };
+
   libcap = import ../os-specific/linux/libcap {
     inherit fetchurl stdenv;
   };