diff --git a/misc/config/config-200-crosstools.in b/misc/config/config-200-crosstools.in
index 248cb935b..8e168f10e 100644
--- a/misc/config/config-200-crosstools.in
+++ b/misc/config/config-200-crosstools.in
@@ -27,7 +27,7 @@ menu_begin MENU_CROSSTOOLS 'Cross Toolchain Creation'
 		. architecture/$ROCKCFG_ARCH/archtest.out
 	fi
 
-	for crosstarget in sparc sparc64 mips mipsel mips64 mips64el powerpc i386 ; do
+	for crosstarget in sparc sparc64 mips mipsel mips64 mips64el powerpc i386 x86_64 ; do
 		[ "$crosstarget-unknown-linux-gnu" == "$arch_target" ] && continue ;
 		bool "Build $crosstarget cross toolchain" ROCKCFG_PKG_CROSSTOOL_$crosstarget 0
 
@@ -40,7 +40,7 @@ menu_begin MENU_CROSSTOOLS 'Cross Toolchain Creation'
 		if [ "$( eval echo \$ROCKCFG_PKG_CROSSTOOL_$crosstarget )" == 1 ] ; then
 			pkgfork binutils binutils-cross-$crosstarget stages $stages
 
-			pkgfork linux $ROCKCFG_PKG_LINUX_HEADERS-header-cross-$crosstarget \
+			pkgfork linux-libc-headers linux-libc-headers-cross-$crosstarget \
 				stages $stages
 
 			if [ "$ROCKCFG_PKG_GLIBC22_USEIT" = 1 ] ; then
diff --git a/misc/pkgsel/sets/basic.set b/misc/pkgsel/sets/basic.set
index 67a62ed9d..807ca090a 100644
--- a/misc/pkgsel/sets/basic.set
+++ b/misc/pkgsel/sets/basic.set
@@ -22,10 +22,9 @@
 
 / 00-dirtree /		{ p; d; }
 
-/ linux.*-src /		{ s/^X /O / ; p; d; }
-/ linux-drm /		{ s/^X /O / ; p; d; }
+/ linux-drm /		{ s/^X /O / ; p; d; };
 / linux.* /		{ p; d; }
-/ linux.*-header /	{ p; d; }
+/ linux-libc-headers /	{ p; d; }
 / glibc /		{ p; d; }
 
 / gcc /			{ p; d; }
diff --git a/package/base/linux-libc-headers/fix-agpgart-h.patch b/package/base/linux-libc-headers/fix-agpgart-h.patch
new file mode 100644
index 000000000..fc73c382b
--- /dev/null
+++ b/package/base/linux-libc-headers/fix-agpgart-h.patch
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 000000000..b7b2154fb
--- /dev/null
+++ b/package/base/linux-libc-headers/linux-libc-headers.conf
@@ -0,0 +1,52 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/base/linux-libc-headers/linux-libc-headers.conf
+# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+# 
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+pkg_linux_libc_headers_cross=""
+
+case "$xpkg" in
+	*-cross-*)
+		pkg_linux_libc_headers_cross="${xpkg#**-cross-}"
+		;;		
+esac
+
+llh_main() {
+
+	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
+	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
new file mode 100644
index 000000000..335f6ab40
--- /dev/null
+++ b/package/base/linux-libc-headers/linux-libc-headers.desc
@@ -0,0 +1,44 @@
+
+[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+[COPY] 
+[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+[COPY] Please add additional copyright information _after_ the line containing
+[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+[COPY] 
+[COPY] ROCK Linux: rock-src/package/base/linux-libc-headers/linux-libc-headers.desc
+[COPY] ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
+[COPY] 
+[COPY] This program is free software; you can redistribute it and/or modify
+[COPY] it under the terms of the GNU General Public License as published by
+[COPY] the Free Software Foundation; either version 2 of the License, or
+[COPY] (at your option) any later version. A copy of the GNU General Public
+[COPY] License can be found at Documentation/COPYING.
+[COPY] 
+[COPY] Many people helped and are helping developing ROCK Linux. Please
+[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+[COPY] file for details.
+[COPY] 
+[COPY] --- ROCK-COPYRIGHT-NOTE-END ---
+
+[I] User space part of the Linux kernel headers
+
+[T] User space part of the Linux kernel headers.
+
+[U] http://ep09.pld-linux.org/~mmazur/linux-libc-headers/
+
+[A] Mariusz Mazur <mmazur /at/ kernel.pl> { Maintainer }
+[M] Stefan Fiedler <stefan.fiedler at students.jku.at>
+
+[C] base/kernel
+[F] DIETLIBC KERNEL
+[F] CORE
+
+[E] group kernel-header linux-libc-headers
+
+[L] GPL
+[S] Stable
+[V] 2.6.12.0
+[P] X 01-------9 100.200
+
+[D] 3015212746 linux-libc-headers-2.6.12.0.tar.bz2 http://ep09.pld-linux.org/~mmazur/linux-libc-headers/
diff --git a/package/base/linux-libc-headers/old b/package/base/linux-libc-headers/old
new file mode 100644
index 000000000..38634bc20
--- /dev/null
+++ b/package/base/linux-libc-headers/old
@@ -0,0 +1,93 @@
+Index: ../linux/linux.conf
+===================================================================
+--- ../linux/linux.conf	(revision 7)
++++ ../linux/linux.conf	(working copy)
+@@ -24,8 +24,6 @@
+ pkg_linux_cross=""
+ 
+ case "$xpkg-" in
+-	*-header-*)
+-		pkg_linux_mode=header ;;
+ 	*-source-*)
+ 		unset splitdesc_dev
+ 		pkg_linux_mode=source ;;
+@@ -36,12 +34,8 @@
+ case "$xpkg" in
+ 	*-cross-*)
+ 		pkg_linux_cross="${xpkg#**-cross-}"
+-		if [ $pkg_linux_mode = header ]; then
+-			echo_status "Preparing to build a linux kernel $pkg_linux_cross cross-headers package."
+-		else
+-			echo_error "Building linux kernel cross packages isn't supported yet."
+-			exit 1
+-		fi
++		echo_error "Building linux kernel cross packages isn't supported yet."
++		exit 1
+ 		;;
+ esac
+ 
+@@ -347,52 +341,6 @@
+ 	rm -f .config.old .config.[1-9]
+ }
+ 
+-main_lx_header() {
+-	echo "Extracting the Linux Kernel Sources [$ver] ... "
+-	tar $taropt $archdir/$srctar
+-	cd linux-$vanilla_ver
+-
+-	# patch and configure
+-	lx_config
+-
+-	if [ -z "$pkg_linux_cross" ]; then
+-		incdir="$root/$prefix/include/linux$treever"
+-	else
+-		incdir="$root/$prefix/$pkg_linux_cross-unknown-linux-gnu/include"
+-	fi
+-
+-	# install the header files - and do some post-processing for sparc
+-	rm -rf $incdir/{asm,asm-generic,linux,asm-sparc,asm-sparc64}
+-	mkdir -p $incdir
+-	if [ "$lx_cpu" != sparc -a "$lx_cpu" != sparc64 ]
+-	then
+-		mkdir -p $incdir/asm
+-		cp -rv include/asm/* $incdir/asm/
+-		cp -rv include/{asm-generic,linux} $incdir/
+-	else
+-		# we can only generate this files when we have a cross compiler
+-		# which is stage 1 and above ...
+-		if [ $stagelevel -gt 0 -a $treever != 26 ] ; then
+-			# build two generated headers first ...
+-			make ARCH=sparc CROSS_COMPILE=$archprefix KCC=$KCC \
+-			  arch/sparc/kernel/Makefile check_asm
+-			[ $lx_cpu = sparc64 ] && \
+-				make ARCH=sparc64 CROSS_COMPILE=$archprefix KCC=sparc64-unknown-linux-gnu-gcc \
+-				  arch/sparc64/kernel/Makefile check_asm
+-		fi
+-
+-		cp -rv include/{asm-{sparc{,64},generic},linux} $incdir/
+-		cp -v $confdir/generate-asm . ; chmod +x ./generate-asm
+-		./generate-asm $incdir
+-	fi
+-	if [ -z "$pkg_linux_cross" -a "linux$treever" = "$ROCKCFG_PKG_LINUX_HEADERS" ]; then
+-		for x in $incdir/*; do
+-			rm -rf $root/$prefix/include/${x##*/}
+-			ln -sf linux$treever/${x##*/} $root/$prefix/include/${x##*/}
+-		done
+-	fi
+-}
+-
+ main_lx() {
+ 	lx_config
+ 
+@@ -534,11 +482,6 @@
+ 		createdocs=0
+ 		custmain="main_lx_src"
+ 		;;
+-	header)
+-		autoextract=0
+-		createdocs=0
+-		custmain="main_lx_header"
+-		;;
+ 	image)
+ 		custmain="main_lx"
+ 		autopatch=0
diff --git a/package/base/linux-libc-headers/pkgmapper.in b/package/base/linux-libc-headers/pkgmapper.in
new file mode 100644
index 000000000..76019f716
--- /dev/null
+++ b/package/base/linux-libc-headers/pkgmapper.in
@@ -0,0 +1 @@
+pkg=${pkg##linux-libc-headers?}
diff --git a/package/base/linux/config-500.in b/package/base/linux/config-500.in
index 47d10a736..af05a1252 100644
--- a/package/base/linux/config-500.in
+++ b/package/base/linux/config-500.in
@@ -24,19 +24,6 @@ if pkgcheck linux X
 then
   menu_begin MENU_PKG_LINUX 'Linux Kernel Options'
 
-	choice ROCKCFG_PKG_LINUX_HEADERS linux26 \
-		linux24 'Use linux kernel 2.4.x headers in /usr/include' \
-		linux26 'Use linux kernel 2.6.x headers in /usr/include'
-
-	pkgfork linux ${ROCKCFG_PKG_LINUX_HEADERS}-header stages 01-------9
-
-	if [ "$ROCKCFG_PKG_LINUX_HEADERS" = linux24 ]; then
-		pkgfork linux linux26-header stages ---3-----9
-	fi
-	if [ "$ROCKCFG_PKG_LINUX_HEADERS" = linux26 ]; then
-		pkgfork linux linux24-header stages ---3-----9
-	fi
-
 	bool 'Place linux24 sources in /usr/src' \
 		ROCKCFG_PKG_LINUX_SRC24 0
 
diff --git a/package/base/linux/linux.conf b/package/base/linux/linux.conf
index 56f97fc44..3824dbf49 100644
--- a/package/base/linux/linux.conf
+++ b/package/base/linux/linux.conf
@@ -24,8 +24,6 @@ pkg_linux_mode=image
 pkg_linux_cross=""
 
 case "$xpkg-" in
-	*-header-*)
-		pkg_linux_mode=header ;;
 	*-source-*)
 		unset splitdesc_dev
 		pkg_linux_mode=source ;;
@@ -36,12 +34,8 @@ echo_status "Preparing to build a linux kernel $pkg_linux_mode package."
 case "$xpkg" in
 	*-cross-*)
 		pkg_linux_cross="${xpkg#**-cross-}"
-		if [ $pkg_linux_mode = header ]; then
-			echo_status "Preparing to build a linux kernel $pkg_linux_cross cross-headers package."
-		else
-			echo_error "Building linux kernel cross packages isn't supported yet."
-			exit 1
-		fi
+		echo_error "Building linux kernel cross packages isn't supported yet."
+		exit 1
 		;;
 esac
 
@@ -347,52 +341,6 @@ main_lx_src() {
 	rm -f .config.old .config.[1-9]
 }
 
-main_lx_header() {
-	echo "Extracting the Linux Kernel Sources [$ver] ... "
-	tar $taropt $archdir/$srctar
-	cd linux-$vanilla_ver
-
-	# patch and configure
-	lx_config
-
-	if [ -z "$pkg_linux_cross" ]; then
-		incdir="$root/$prefix/include/linux$treever"
-	else
-		incdir="$root/$prefix/$pkg_linux_cross-unknown-linux-gnu/include"
-	fi
-
-	# install the header files - and do some post-processing for sparc
-	rm -rf $incdir/{asm,asm-generic,linux,asm-sparc,asm-sparc64}
-	mkdir -p $incdir
-	if [ "$lx_cpu" != sparc -a "$lx_cpu" != sparc64 ]
-	then
-		mkdir -p $incdir/asm
-		cp -rv include/asm/* $incdir/asm/
-		cp -rv include/{asm-generic,linux} $incdir/
-	else
-		# we can only generate this files when we have a cross compiler
-		# which is stage 1 and above ...
-		if [ $stagelevel -gt 0 -a $treever != 26 ] ; then
-			# build two generated headers first ...
-			make ARCH=sparc CROSS_COMPILE=$archprefix KCC=$KCC \
-			  arch/sparc/kernel/Makefile check_asm
-			[ $lx_cpu = sparc64 ] && \
-				make ARCH=sparc64 CROSS_COMPILE=$archprefix KCC=sparc64-unknown-linux-gnu-gcc \
-				  arch/sparc64/kernel/Makefile check_asm
-		fi
-
-		cp -rv include/{asm-{sparc{,64},generic},linux} $incdir/
-		cp -v $confdir/generate-asm . ; chmod +x ./generate-asm
-		./generate-asm $incdir
-	fi
-	if [ -z "$pkg_linux_cross" -a "linux$treever" = "$ROCKCFG_PKG_LINUX_HEADERS" ]; then
-		for x in $incdir/*; do
-			rm -rf $root/$prefix/include/${x##*/}
-			ln -sf linux$treever/${x##*/} $root/$prefix/include/${x##*/}
-		done
-	fi
-}
-
 main_lx() {
 	lx_config
 
@@ -534,11 +482,6 @@ case "$pkg_linux_mode" in
 		createdocs=0
 		custmain="main_lx_src"
 		;;
-	header)
-		autoextract=0
-		createdocs=0
-		custmain="main_lx_header"
-		;;
 	image)
 		custmain="main_lx"
 		autopatch=0
diff --git a/package/base/linux/linux.desc b/package/base/linux/linux.desc
index 34ece5777..144a58d9b 100644
--- a/package/base/linux/linux.desc
+++ b/package/base/linux/linux.desc
@@ -35,7 +35,6 @@
 [F] CORE
 
 [E] group kernel-image  linux24        linux26
-[E] group kernel-header linux24-header linux26-header
 [E] group kernel-source linux24-source linux26-source
 
 [E] del net-tools