diff --git a/pkgs/os-specific/linux/kernel-headers/builder.sh b/pkgs/os-specific/linux/kernel-headers/builder.sh
index da349125da8..bf695027399 100644
--- a/pkgs/os-specific/linux/kernel-headers/builder.sh
+++ b/pkgs/os-specific/linux/kernel-headers/builder.sh
@@ -11,15 +11,16 @@ buildPhase=buildPhase
 installPhase() {
     mkdir $out
     mkdir $out/include
+    cp -prvd include/linux include/asm-generic $out/include
     if test $system = "i686-linux"; then
-        cp -prvd include/linux include/asm-i386 include/asm-generic $out/include
-        cd $out/include
-        ln -s asm-i386 asm
+        platform=i386
+    elif test $system = "x86_64-linux"; then
+        platform=x86_64
     elif test $system = "powerpc-linux"; then
-        cp -prvd include/linux include/asm-ppc include/asm-generic $out/include
-        cd $out/include
-        ln -s asm-ppc asm
+        platform=ppw
     fi
+    cp -prvd include/asm-$platform $out/include
+    ln -s asm-$platform $out/include/asm
     echo -n > $out/include/linux/autoconf.h
 }