diff --git a/templates/kernel-firmware b/templates/kernel-firmware
new file mode 120000
index 0000000000..36c8c047ca
--- /dev/null
+++ b/templates/kernel-firmware
@@ -0,0 +1 @@
+kernel
\ No newline at end of file
diff --git a/templates/kernel/firmware.template b/templates/kernel/firmware.template
new file mode 100644
index 0000000000..64689f0781
--- /dev/null
+++ b/templates/kernel/firmware.template
@@ -0,0 +1,13 @@
+# Template file for 'kernel-firmware'.
+#
+short_desc="${pkgname} firmware binary files"
+long_desc="${long_desc}
+
+ This package contains the binary firmware files required
+ for some hardware, built from the Linux kernel."
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/lib
+	mv ${SRCPKGDESTDIR}/lib/firmware ${DESTDIR}/lib
+}
diff --git a/templates/kernel/template b/templates/kernel/template
index 1a2c1d003f..ffbed510f7 100644
--- a/templates/kernel/template
+++ b/templates/kernel/template
@@ -1,6 +1,9 @@
 # Template file for 'kernel'
 pkgname=kernel
-version=2.6.30.4
+_kernel_ver=2.6.30
+_kernel_patch_ver=4
+version=${_kernel_ver}.${_kernel_patch_ver}
+revision=1
 wrksrc="linux-$version"
 distfiles="${KERNEL_SITE}/kernel/v2.6/linux-$version.tar.bz2"
 build_style=gnu_makefile
@@ -11,9 +14,10 @@ short_desc="The Linux kernel and associated stuff (2.6 branch)"
 maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=b52d3949219d912763f6614f1c68d51018f820ca6267f8d194dd5ac8b85159b8
 long_desc="
- This package provides the linux kernel image, kernel modules
- and firmware files."
+ This package provides the linux kernel image and the
+ kernel modules."
 
+subpackages="firmware"
 triggers="initramfs-tools"
 
 Add_dependency full glibc
@@ -22,6 +26,7 @@ Add_dependency full coreutils
 Add_dependency full module-init-tools
 Add_dependency full initramfs-tools
 Add_dependency build perl
+Add_dependency run kernel-firmware ${_kernel_ver}
 
 pre_build()
 {