diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
index 46f662e46b1b..0439afe102d7 100644
--- a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
+++ b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
@@ -20,9 +20,6 @@ stdenv.mkDerivation {
 
   buildInputs = [perl];
 
-  # !!! hacky
-  fixupPhase = "ln -s $out/include/asm $out/include/asm-$platform";
-
   extraIncludeDirs =
     if stdenv.system == "powerpc-linux" then ["ppc"] else [];
 
@@ -41,4 +38,12 @@ stdenv.mkDerivation {
     ensureDir $out/include/config
     echo "${version}-default" > $out/include/config/kernel.release
   '';
+
+  # !!! hacky
+  fixupPhase = ''
+    ln -s asm $out/include/asm-$platform
+    if test "$platform" = "i386" -o "$platform" = "x86_64"; then
+      ln -s asm $out/include/asm-x86
+    fi  
+  '';
 }
diff --git a/pkgs/os-specific/linux/kvm/82.nix b/pkgs/os-specific/linux/kvm/84.nix
similarity index 86%
rename from pkgs/os-specific/linux/kvm/82.nix
rename to pkgs/os-specific/linux/kvm/84.nix
index eb5db5c54247..a1830e4c203a 100644
--- a/pkgs/os-specific/linux/kvm/82.nix
+++ b/pkgs/os-specific/linux/kvm/84.nix
@@ -2,12 +2,12 @@
    
 assert stdenv.isLinux;
    
-stdenv.mkDerivation {
-  name = "kvm-82";
+stdenv.mkDerivation rec {
+  name = "kvm-84";
    
   src = fetchurl {
-    url = mirror://sourceforge/kvm/kvm-82.tar.gz;
-    sha256 = "1fk58g8z9v7z42vy76zq0sq28slqf8zszzmh73vyxm07vfbc96zs";
+    url = "mirror://sourceforge/kvm/${name}.tar.gz";
+    sha256 = "13lqhy4lpxqby7qj3l1cdbj73c7jmvkq73bc5wchwn0l0dkjsjlk";
   };
 
   patches = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d324553b38a9..c4cc3bd9aa6c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6985,7 +6985,7 @@ let
     kernelHeaders = kernelHeaders_2_6_26;
   };
 
-  kvm82 = import ../os-specific/linux/kvm/82.nix {
+  kvm84 = import ../os-specific/linux/kvm/84.nix {
     inherit fetchurl stdenv zlib e2fsprogs SDL alsaLib pkgconfig rsync;
     kernelHeaders = kernelHeaders_2_6_28;
   };