diff --git a/package/base/linux-libc-headers/fix-agpgart-h.patch b/package/base/linux-libc-headers/fix-agpgart-h.patch
deleted file mode 100644
index fc73c382b..000000000
--- a/package/base/linux-libc-headers/fix-agpgart-h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNpr linux-libc-headers-2.6.12.0.orig/include/linux/agpgart.h linux-libc-headers-2.6.12.0/include/linux/agpgart.h
---- linux-libc-headers-2.6.12.0.orig/include/linux/agpgart.h	2006-01-05 23:25:08 +0300
-+++ linux-libc-headers-2.6.12.0/include/linux/agpgart.h	2006-02-12 13:00:31 +0300
-@@ -50,6 +50,7 @@
- #endif
- 
- #include <linux/types.h>
-+#include <asm/types.h>
- 
- struct agp_version {
- 	__u16 major;
diff --git a/package/base/linux-libc-headers/linux-libc-headers.conf b/package/base/linux-libc-headers/linux-libc-headers.conf
index b7b2154fb..5c114b00d 100644
--- a/package/base/linux-libc-headers/linux-libc-headers.conf
+++ b/package/base/linux-libc-headers/linux-libc-headers.conf
@@ -1,3 +1,4 @@
+#!/bin/bash
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
@@ -20,33 +21,42 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-pkg_linux_libc_headers_cross=""
+lx_cpu="$arch_machine"
+incdir=$root/$prefix/include
 
 case "$xpkg" in
 	*-cross-*)
-		pkg_linux_libc_headers_cross="${xpkg#**-cross-}"
+		lx_cpu="${xpkg#**-cross-}"
+		incdir=$root/$prefix/$lx_cpu-unknown-linux-gnu/include
 		;;		
 esac
 
+lx_cpu=$( echo "$lx_cpu" | \
+	sed -e s/x86$/i386/ -e s/powerpc/ppc/    \
+		-e s/hppa/parisc/ -e s/i.86/i386/    \
+		-e s/sun4u/sparc64/ -e s/arm.*/arm/  \
+		-e s/sa110/arm/ -e s/s390x/s390/     \
+		-e s/parisc64/parisc/ )
+
+custmain=llh_main
 llh_main() {
+	cp -av include/{asm-generic,asm-$lx_cpu,linux} $incdir/
+	ln -svf asm-$lx_cpu $incdir/asm
 
-	if [ -z "$pkg_linux_libc_headers_cross" ] ; then
-		incdir=$root/$prefix/include
-		lx_cpu=$( echo "$arch_machine" | \
-			sed -e s/x86$/i386/ -e s/powerpc/ppc/    \
-			    -e s/hppa/parisc/ -e s/i.86/i386/    \
-			    -e s/sun4u/sparc64/ -e s/arm.*/arm/  \
-			    -e s/sa110/arm/ -e s/s390x/s390/     \
-			    -e s/parisc64/parisc/ )
-	else
-		incdir=$root/$prefix/${pkg_linux_libc_headers_cross}-unknown-linux-gnu/include
-		lx_cpu=$pkg_linux_libc_headers_cross
+	if [ "$ROCKCFG_MULTILIB" = 1 ] ; then
+		case "$lx_cpu" in
+		sparc64)
+			cp -av include/asm-{sparc,sparc64-biarch} $incdir/
+			ln -svf asm-sparc64-biarch $incdir/asm
+			;;
+		x86_64)
+			cp -av include/asm-{i386,x86_64-biarch} $incdir/
+			ln -svf asm-x86_64-biarch $incdir/asm
+			;;
+		ppc)
+			cp -av include/asm-powerpc $incdir/
+			ln -svf asm-powerpc $incdir/asm
+			;;
+		esac
 	fi
-
-	mkdir -p $incdir
-	cp -rv include/linux $incdir
-	cp -rv include/asm-$lx_cpu $incdir
-	ln -svf asm-$lx_cpu $incdir/asm
 }
-
-custmain=llh_main
diff --git a/package/base/linux-libc-headers/linux-libc-headers.desc b/package/base/linux-libc-headers/linux-libc-headers.desc
index e9700db26..fa88553a2 100644
--- a/package/base/linux-libc-headers/linux-libc-headers.desc
+++ b/package/base/linux-libc-headers/linux-libc-headers.desc
@@ -25,9 +25,9 @@
 
 [T] User space part of the Linux kernel headers.
 
-[U] http://ep09.pld-linux.org/~mmazur/linux-libc-headers/
+[U] http://headers.cross-lfs.org
 
-[A] Mariusz Mazur <mmazur /at/ kernel.pl> { Maintainer }
+[A] cross-lfs.org
 [M] Stefan Fiedler <stefan.fiedler at students.jku.at>
 
 [C] base/kernel
@@ -38,7 +38,7 @@
 
 [L] GPL
 [S] Stable
-[V] 2.6.12.0
-[P] 0 01-------9 100.400
+[V] 2.6.20.1-02252007
+[P] 0 0-X--5---9 100.100
 
-[D] 3015212746 linux-libc-headers-2.6.12.0.tar.bz2 http://ep09.pld-linux.org/~mmazur/linux-libc-headers/
+[D] 1448854930 linux-headers-2.6.20.1-02252007.tar.bz2 http://cross-lfs.org/files/packages/svn/