diff --git a/templates/kernel26-i386-dotconfig b/templates/kernel-i386-dotconfig
similarity index 100%
rename from templates/kernel26-i386-dotconfig
rename to templates/kernel-i386-dotconfig
diff --git a/templates/kernel26-x86_64-dotconfig b/templates/kernel-x86_64-dotconfig
similarity index 100%
rename from templates/kernel26-x86_64-dotconfig
rename to templates/kernel-x86_64-dotconfig
diff --git a/templates/kernel26.tmpl b/templates/kernel.tmpl
similarity index 50%
rename from templates/kernel26.tmpl
rename to templates/kernel.tmpl
index b926cda6cea..9df05fe5153 100644
--- a/templates/kernel26.tmpl
+++ b/templates/kernel.tmpl
@@ -1,5 +1,5 @@
-# Template file for 'kernel26'
-pkgname=kernel26
+# Template file for 'kernel'
+pkgname=kernel
 version=2.6.27.9
 # Vanilla kernel + UnionFS + SquashFS patches.
 patch_files="
@@ -13,18 +13,18 @@ build_style=gnu_makefile
 make_build_target="bzImage modules"
 make_install_target="modules_install
  INSTALL_MOD_PATH=$XBPS_DESTDIR/$pkgname-$version"
-short_desc="The Linux kernel (2.6 branch)"
+short_desc="The Linux kernel and associated stuff (2.6 branch)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=fd710a841be6119cdd2c42f92ca405265fb156e279006bb89bb874e4198b3e5e
 long_desc="
- This package provides the linux kernel image and kernel modules
- from the 2.6 branch."
+ This package provides the linux kernel image, kernel modules
+ and firmware files."
 
 build_depends="perl-5.10.0 module-init-tools-3.5"
 
 pre_build()
 {
-	# If there's a file called kernel26-<arch>-dotconfig, use it to
+	# If there's a file called kernel-<arch>-dotconfig, use it to
 	# configure the kernel; otherwise run the menuconfig target.
 	local arch=
 
@@ -34,10 +34,9 @@ pre_build()
 		arch=x86_64
 	fi
 
-	if [ -f $XBPS_TEMPLATESDIR/kernel26-$arch-dotconfig ]; then
+	if [ -f $XBPS_TEMPLATESDIR/kernel-$arch-dotconfig ]; then
 		msg_normal "Detected a .config file for your arch, using it."
-        	cp -f $XBPS_TEMPLATESDIR/kernel26-$arch-dotconfig \
-                	$wrksrc/.config
+        	cp -f $XBPS_TEMPLATESDIR/kernel-$arch-dotconfig $wrksrc/.config
         	make oldconfig
 	else
         	make menuconfig
@@ -54,42 +53,16 @@ post_install()
 		      m68k* mips mn10300 parisc powerpc ppc s390 sh* sparc* \
 		      um v850 xtensa"
 	#
-	# Install bzImage, vmlinux and copy necessary stuff to build packages
-	# that require this. This is based off of kernel26 pkgbuild from
-	# Archlinux.
+	# Install the kernel, modules and firmware files.
+	# This is based in the kernel26 pkgbuild from Arch Linux.
 	#
 	install -d $destdir/lib $destdir/boot
 
 	cd $wrksrc || exit 1
 	install -m 644 arch/x86/boot/bzImage $destdir/boot/vmlinuz-$version
 	install -m 644 System.map $destdir/boot/System.map-$version
-	install -D -m 644 Makefile $destdir/usr/src/linux-$version/Makefile
-	install -D -m 644 kernel/Makefile \
-		$destdir/usr/src/linux-$version/kernel/Makefile
-	install -D -m 644 .config $destdir/usr/src/linux-$version/.config
-	for i in ${incdirs}; do
-		cp -a include/$i $destdir/usr/src/linux-$version/include
-	done
 	install -D -m 644 Module.symvers \
 		$destdir/usr/src/linux-$version/Module.symvers
-	cp -a scripts $destdir/usr/src/linux-$version
-
-	mkdir -p $destdir/usr/src/linux-$version/arch/x86/kernel
-	if [ "$xbps_machine" != "x86_64" ]; then
-		install -D -m 644 arch/x86/Makefile_32.cpu \
-			$destdir/usr/src/linux-$version/arch/x86/Makefile_32.cpu
-	fi
-	cp arch/x86/kernel/asm-offsets.s \
+	install -D -m 644 arch/x86/kernel/asm-offsets.s \
 		$destdir/usr/src/linux-$version/arch/x86/kernel
-
-	for i in $(find . -name "Kconfig*"); do 
-    		mkdir -p $destdir/usr/src/linux-$version/$(echo $i | sed 's|/Kconfig.*||')
-    		cp $i $destdir/usr/src/linux-$version/$i
-	done
-
-	cd $destdir/usr/src/linux-$version/include && ln -s asm-x86 asm
-	cd $destdir/usr/src && ln -s linux-$version linux
-	for arch in ${_arch}; do
-		rm -rf $destdir/usr/src/linux-$version/arch/$arch
-	done
 }