diff --git a/srcpkgs/kernel-snapshot-firmware b/srcpkgs/kernel-snapshot-firmware
new file mode 120000
index 00000000000..5631299ae76
--- /dev/null
+++ b/srcpkgs/kernel-snapshot-firmware
@@ -0,0 +1 @@
+kernel-snapshot
\ No newline at end of file
diff --git a/srcpkgs/kernel-snapshot/kernel-firmware.template b/srcpkgs/kernel-snapshot/kernel-snapshot-firmware.template
similarity index 81%
rename from srcpkgs/kernel-snapshot/kernel-firmware.template
rename to srcpkgs/kernel-snapshot/kernel-snapshot-firmware.template
index 743910db6b4..95b4ea9f929 100644
--- a/srcpkgs/kernel-snapshot/kernel-firmware.template
+++ b/srcpkgs/kernel-snapshot/kernel-snapshot-firmware.template
@@ -1,10 +1,12 @@
-# Template file for 'kernel-firmware'.
+# Template file for 'kernel-snapshot-firmware'.
 #
 short_desc="${pkgname} firmware binary files"
 long_desc="
  This package contains the binary firmware files required
  for some hardware, built from the Linux kernel."
 
+noarch=yes
+
 do_install()
 {
 	mkdir -p ${DESTDIR}/lib
diff --git a/srcpkgs/kernel-snapshot/kernel-snapshot-headers.template b/srcpkgs/kernel-snapshot/kernel-snapshot-headers.template
index 7f396b864c3..f1a9b6382a4 100644
--- a/srcpkgs/kernel-snapshot/kernel-snapshot-headers.template
+++ b/srcpkgs/kernel-snapshot/kernel-snapshot-headers.template
@@ -5,6 +5,8 @@ long_desc="
  This package contains the required source headers to be able to build
  external 3rd party binary modules."
 
+revision=1
+
 do_install()
 {
 	mkdir -p ${DESTDIR}/usr
diff --git a/srcpkgs/kernel-snapshot/template b/srcpkgs/kernel-snapshot/template
index 5d3d915aed6..52e8ea8b950 100644
--- a/srcpkgs/kernel-snapshot/template
+++ b/srcpkgs/kernel-snapshot/template
@@ -4,6 +4,7 @@
 
 # Override required vars.
 pkgname=kernel-snapshot
+revision=1
 _kernel_snapshot=yes
 _kernel_ver=2.6.33
 _kernel_patch_ver=rc8
@@ -11,13 +12,26 @@ version=${_kernel_ver}${_kernel_patch_ver}
 wrksrc="linux-${_kernel_ver}-${_kernel_patch_ver}"
 distfiles="${KERNEL_SITE}/kernel/v2.6/testing/linux-${_kernel_ver}-${_kernel_patch_ver}.tar.bz2"
 checksum=9b5feeb8cf473838d34bd66c6ce9549c654817755559b6a6050d4930cca6d0fc
-subpackages="kernel-firmware $pkgname-headers"
+subpackages="$pkgname-firmware $pkgname-headers"
 
 # Reset some stuff.
 unset build_depends run_depends
 
-Add_dependency run kernel-firmware	">=2.6.32"
+Add_dependency run ${pkgname}-firmware	">=${version}"
 Add_dependency run initramfs-tools
 Add_dependency build perl
 Add_dependency full coreutils
 Add_dependency full module-init-tools
+
+post_install()
+{
+	if [ -n "${revision}" ]; then
+		lver="${_kernel_ver}-${_kernel_patch_ver}_${revision}"
+	else
+		lver="${_kernel_ver}-${_kernel_patch_ver}"
+	fi
+
+	mv ${DESTDIR}/lib/firmware ${DESTDIR}/firmware
+	mkdir -p ${DESTDIR}/lib/firmware
+	mv ${DESTDIR}/firmware ${DESTDIR}/lib/firmware/${lver}
+}