diff --git a/templates/kernel-headers b/templates/kernel-headers
new file mode 120000
index 0000000000..36c8c047ca
--- /dev/null
+++ b/templates/kernel-headers
@@ -0,0 +1 @@
+kernel
\ No newline at end of file
diff --git a/templates/kernel-headers/template b/templates/kernel-headers/template
deleted file mode 100644
index e104cc5941..0000000000
--- a/templates/kernel-headers/template
+++ /dev/null
@@ -1,69 +0,0 @@
-# Template file for 'kernel-headers'
-pkgname=kernel-headers
-version=2.6.31.1
-wrksrc="linux-$version"
-distfiles="${KERNEL_SITE}/kernel/v2.6/linux-$version.tar.bz2"
-build_style=custom-install
-short_desc="The Linux kernel headers"
-maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=090af01804323c29e07f0a550f192468eb96cdba9a13d643b03e648a04af6872
-long_desc="
- This package provides the linux kernel headers."
-
-Add_dependency build	perl
-Add_dependency build	module-init-tools
-Add_dependency run	kernel-libc-headers ${version}
-
-do_install()
-{
-	local destdir=${DESTDIR}/usr/src/$pkgname-$version
-	local arch=
-	local incdirs="acpi asm-generic config linux math-emu media \
-			net pcmcia scsi sound video"
-	local archs="alpha arm arm26 avr32 blackfin cris frv h8300 ia64 m32r \
-		      m68k* mips mn10300 parisc powerpc ppc s390 sh* sparc* \
-		      um v850 xtensa"
-	#
-	# Install necessary stuff to build packages that require this.
-	# This is based in the kernel26 pkgbuild from Arch Linux.
-	#
-
-	cd $wrksrc || exit 1
-
-	if [ "$xbps_machine" != "x86_64" ]; then
-                arch=i386
-        else
-                arch=x86_64
-        fi
-
-	cp -f $XBPS_TEMPLATESDIR/kernel/$arch-dotconfig $wrksrc/.config
-	make oldconfig
-
-	install -D -m 644 Makefile $destdir/Makefile
-	install -D -m 644 kernel/Makefile $destdir/kernel/Makefile
-	install -D -m 644 .config $destdir/.config
-	for i in ${incdirs}; do
-		cp -a include/$i $destdir/include
-	done
-	cp -a arch/x86/include/asm $destdir/include
-	cp -a scripts $destdir
-
-	mkdir -p $destdir/arch/x86/kernel
-	if [ "$xbps_machine" != "x86_64" ]; then
-		install -D -m 644 arch/x86/Makefile_32.cpu \
-			$destdir/arch/x86/Makefile_32.cpu
-	fi
-	for i in $(find . -name "Kconfig*"); do 
-		mkdir -p $destdir/$(echo $i | sed 's|/Kconfig.*||')
-		cp $i $destdir/$i
-	done
-	for i in $(find . -name "Makefile*"); do
-		mkdir -p $destdir/$(echo $i | sed 's|/Makefile.*||')
-		cp $i $destdir/$i
-	done
-	cd $XBPS_DESTDIR/$pkgname-$version/usr/src && \
-		ln -s $pkgname-$version linux
-	for arch in ${archs}; do
-		rm -rf $destdir/arch/${arch}
-	done
-}
diff --git a/templates/kernel/headers.template b/templates/kernel/headers.template
new file mode 100644
index 0000000000..4a4c8b59e4
--- /dev/null
+++ b/templates/kernel/headers.template
@@ -0,0 +1,12 @@
+# Template file for 'kernel-headers'.
+#
+short_desc="${pkgname} src headers"
+long_desc="
+ This package contains the required source headers to be able to build
+ external 3rd party binary modules."
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/src ${DESTDIR}/usr
+}
diff --git a/templates/kernel/template b/templates/kernel/template
index 7baf575d69..61074177c1 100644
--- a/templates/kernel/template
+++ b/templates/kernel/template
@@ -8,18 +8,14 @@ patch_files="unionfs-2.5.3_for_2.6.31.diff.gz"
 patch_args="-Np1"
 wrksrc="linux-$version"
 distfiles="${KERNEL_SITE}/kernel/v2.6/linux-$version.tar.bz2"
-build_style=gnu_makefile
-make_build_target="bzImage modules"
-make_install_target="modules_install
- INSTALL_MOD_PATH=${XBPS_DESTDIR}/${pkgname}-${version}"
+build_style=custom-install
 short_desc="The Linux kernel and associated stuff (2.6 branch)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b23aae233afd8b104d45935f293451683f6ce88f258970536898b9ca0bf9bedb
 long_desc="
- This package provides the linux kernel image and the
- kernel modules."
+ This package provides the linux kernel image and associated modules."
 
-subpackages="firmware"
+subpackages="firmware headers"
 triggers="initramfs-tools"
 essential=yes
 
@@ -31,51 +27,168 @@ Add_dependency full initramfs-tools
 Add_dependency build perl
 Add_dependency run kernel-firmware ${_kernel_ver}
 
-pre_build()
+do_install()
 {
 	# If there's a file called kernel-<arch>-dotconfig, use it to
 	# configure the kernel; otherwise run the menuconfig target.
-	local arch=
+	local arch lver mjobs
 
+	if [ "$XBPS_MAKEJOBS" -gt 1 ]; then
+		mjobs="-j $XBPS_MAKEJOBS"
+	fi
 	if [ "$xbps_machine" != "x86_64" ]; then
 		arch=i386
 	else
 		arch=x86_64
 	fi
 
+	cd ${wrksrc} || return 1
+
+	# Configure
 	if [ -f $XBPS_TEMPLATESDIR/$pkgname/$arch-dotconfig ]; then
 		msg_normal "Detected a .config file for your arch, using it."
 		cp -f $XBPS_TEMPLATESDIR/$pkgname/$arch-dotconfig \
 			$wrksrc/.config
-        	make oldconfig
+		make ${mjobs} oldconfig
 	else
-        	make menuconfig
+		make ${mjobs} menuconfig
 	fi
 	if [ -n "${revision}" ]; then
 		sed -i -e "s|LOCALVERSION=\"\"|LOCALVERSION=\"_${revision}\"|" \
 			${wrksrc}/.config
 	fi
-}
-
-post_install()
-{
-	local lver
+	# Build
+	make ${mjobs} prepare
+	make ${mjobs} bzImage modules || return 1
 
+	# Install kernel, firmware and modules
 	install -d ${DESTDIR}/lib ${DESTDIR}/boot
-	cd $wrksrc || exit 1
-
+	make ${mjobs} INSTALL_MOD_PATH=${DESTDIR} modules_install || return 1
 	if [ -n "$revision" ]; then
 		lver="${version}_${revision}"
 	else
 		lver="${version}"
 	fi
-
 	install -m 644 arch/x86/boot/bzImage ${DESTDIR}/boot/vmlinuz-${lver}
 	install -m 644 System.map ${DESTDIR}/boot/System.map-${lver}
 	install -m 644 .config ${DESTDIR}/boot/config-${lver}
-
 	cd ${DESTDIR}/lib/modules/${lver} && \
 		rm -f source build && \
 		ln -sf ../../../usr/src/kernel-headers-${lver} build && \
 		ln -sf build source
+
+	# Install required headers to build external modules
+	cd ${wrksrc} || return 1
+	install -D -m644 Makefile \
+		${DESTDIR}/usr/src/kernel-headers-${lver}/Makefile
+	install -D -m644 kernel/Makefile \
+		${DESTDIR}/usr/src/kernel-headers-${lver}/kernel/Makefile
+	install -D -m644 .config \
+		${DESTDIR}/usr/src/kernel-headers-${lver}/.config
+	mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/include
+
+	for i in acpi asm-generic asm-x86 config linux math-emu media net \
+		pcmcia scsi sound trace video; do
+		cp -a include/$i ${DESTDIR}/usr/src/kernel-headers-${lver}/include
+	done
+
+	mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/arch/x86
+	cp -a arch/x86/include ${DESTDIR}/usr/src/kernel-headers-${lver}/arch/x86
+
+	# Copy files necessary for later builds, like nvidia and vmware
+	cp Module.symvers ${DESTDIR}/usr/src/kernel-headers-${lver}
+	cp -a scripts ${DESTDIR}/usr/src/kernel-headers-${lver}
+
+	# Fix permissions on scripts dir
+	chmod og-w -R ${DESTDIR}/usr/src/kernel-headers-${lver}/scripts
+
+	mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/arch/x86/kernel
+	cp arch/x86/Makefile \
+		${DESTDIR}/usr/src/kernel-headers-${lver}/arch/x86
+	if [ "$arch" = "i386" ]; then
+		cp arch/x86/Makefile_32.cpu \
+			${DESTDIR}/usr/src/kernel-headers-${lver}/arch/x86
+	fi
+	cp arch/x86/kernel/asm-offsets.s \
+		${DESTDIR}/usr/src/kernel-headers-${lver}/arch/x86/kernel
+
+	# Add headers for lirc package
+	mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/drivers/media/video
+	cp drivers/media/video/*.h  \
+		${DESTDIR}/usr/src/kernel-headers-${lver}/drivers/media/video
+	for i in bt8xx cpia2 cx25840 cx88 em28xx et61x251 pwc saa7134 \
+		 sn9c102 usbvideo zc0301; do
+		mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/drivers/media/video/$i
+		cp -a drivers/media/video/$i/*.h \
+			${DESTDIR}/usr/src/kernel-headers-${lver}/drivers/media/video/$i
+	done
+
+	# Add docbook makefile
+	install -D -m644 Documentation/DocBook/Makefile \
+		${DESTDIR}/usr/src/kernel-headers-${lver}/Documentation/DocBook/Makefile
+
+	# Add md headers
+	mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/drivers/md
+	cp drivers/md/*.h  \
+		${DESTDIR}/usr/src/kernel-headers-${lver}/drivers/md
+
+	# Add inotify.h
+	mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/include/linux
+	cp include/linux/inotify.h \
+		${DESTDIR}/usr/src/kernel-headers-${lver}/include/linux
+
+	# Add wireless headers
+	mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/net/mac80211/
+	cp net/mac80211/*.h ${DESTDIR}/usr/src/kernel-headers-${lver}/net/mac80211
+
+	# Add dvb headers for external modules in reference to:
+	# http://bugs.archlinux.org/task/9912
+	mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/drivers/media/dvb/dvb-core
+	cp drivers/media/dvb/dvb-core/*.h \
+		${DESTDIR}/usr/src/kernel-headers-${lver}/drivers/media/dvb/dvb-core
+
+	# Add dvb headers for external modules in reference to:
+	# http://bugs.archlinux.org/task/11194
+	mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/include/config/dvb
+	cp include/config/dvb/*.h \
+		${DESTDIR}/usr/src/kernel-headers-${lver}/include/config/dvb
+
+	# Add dvb headers for http://mcentral.de/hg/~mrec/em28xx-new
+	# in reference to:
+	# http://bugs.archlinux.org/task/13146
+	mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/drivers/media/dvb/frontends
+	cp drivers/media/dvb/frontends/lgdt330x.h \
+		${DESTDIR}/usr/src/kernel-headers-${lver}/drivers/media/dvb/frontends
+	cp drivers/media/video/msp3400-driver.h \
+		${DESTDIR}/usr/src/kernel-headers-${lver}/drivers/media/dvb/frontends
+
+	# Add xfs and shmem for aufs building
+	mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/fs/xfs
+	mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/mm
+	cp fs/xfs/xfs_sb.h ${DESTDIR}/usr/src/kernel-headers-${lver}/fs/xfs/xfs_sb.h
+
+	# Add headers vor virtualbox in reference to:
+	# http://bugs.archlinux.org/task/14568
+	cp -a include/drm ${DESTDIR}/usr/src/kernel-headers-${lver}/include
+
+	# Add headers for broadcom wl in reference to:
+	# http://bugs.archlinux.org/task/14568
+	cp -a include/trace ${DESTDIR}/usr/src/kernel-headers-${lver}/include
+
+	# Add vmlinux
+	cp vmlinux ${DESTDIR}/usr/src/kernel-headers-${lver}
+
+	# Copy in Kconfig files
+	for i in `find . -name "Kconfig*"`; do
+		mkdir -p ${DESTDIR}/usr/src/kernel-headers-${lver}/`echo $i | sed 's|/Kconfig.*||'`
+		cp $i ${DESTDIR}/usr/src/kernel-headers-${lver}/$i
+	done
+	cd ${DESTDIR}/usr/src/kernel-headers-${lver}/include && \
+		ln -s asm-x86 asm
+
+	# Remove unneeded architectures
+	for arch in alpha arm* avr32 blackfin cris frv h8300 \
+		ia64 m* p* s* um v850 xtensa; do
+		rm -rf ${DESTDIR}/usr/src/kernel-headers-${lver}/${arch}
+	done
 }