diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.20.7.nix b/pkgs/os-specific/linux/kernel-headers/2.6.21.3.nix
similarity index 70%
rename from pkgs/os-specific/linux/kernel-headers/2.6.20.7.nix
rename to pkgs/os-specific/linux/kernel-headers/2.6.21.3.nix
index d72180b4969..6ec894660ea 100644
--- a/pkgs/os-specific/linux/kernel-headers/2.6.20.7.nix
+++ b/pkgs/os-specific/linux/kernel-headers/2.6.21.3.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation {
-  name = "linux-headers-2.6.20.7";
+  name = "linux-headers-2.6.21.3";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nl.kernel.org/pub/linux/kernel/v2.6/linux-2.6.20.7.tar.bz2;
-    sha256 = "856f5eb3606061bddb38642fe7068cfc184b4b8fc364fdd8612148a5aca5cea8";
+    url = "http://ftp.de.kernel.org/pub/linux/kernel/v2.6/linux-2.6.21.3.tar.bz2";
+    sha256 = "17rxvw42z4amijb8nya54c2h6bb8gnxnr628arv8shmsccf8qsp5";
   };
 
   platform = 
diff --git a/pkgs/os-specific/linux/kvm/17.nix b/pkgs/os-specific/linux/kvm/17.nix
new file mode 100644
index 00000000000..f8a604b7389
--- /dev/null
+++ b/pkgs/os-specific/linux/kvm/17.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, kernelHeaders, zlib, e2fsprogs, SDL, alsaLib}:
+   
+stdenv.mkDerivation {
+  name = "kvm-17";
+   
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/kvm/kvm-17.tar.gz;
+    sha256 = "1c9g92258wbadh6q8m9vp4zszbr50a5crn93iy69s5bkg3n3vs43";
+  };
+
+  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 75fbeb6d5c6..3454333d8ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2272,6 +2272,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  kernelHeaders_2_6_21 = import ../os-specific/linux/kernel-headers/2.6.21.3.nix {
+    inherit fetchurl stdenv;
+  };
+
   kernelHeadersArm = import ../os-specific/linux/kernel-headers-cross {
     inherit fetchurl stdenv;
     cross = "arm-linux";
@@ -2372,6 +2376,12 @@ rec {
     kernelHeaders = stdenv.gcc.libc.kernelHeaders;
   };
 
+  kvm17 = import ../os-specific/linux/kvm/17.nix {
+    inherit fetchurl zlib e2fsprogs SDL alsaLib;
+    stdenv = overrideGCC stdenv gcc34;
+    kernelHeaders = kernelHeaders_2_6_21;
+  };
+
   libcap = import ../os-specific/linux/libcap {
     inherit fetchurl stdenv;
   };