diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index 77689130234..9a8a0b73158 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -1,7 +1,7 @@
 # Template file for 'linux-firmware'
 pkgname=linux-firmware
 version=20150904
-revision=1
+revision=2
 noarch=yes
 short_desc="Binary firmware blobs for the Linux kernel"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
@@ -30,7 +30,7 @@ linux-firmware-amd_package() {
 	short_desc+=" - AMD CPU/GPU microcode"
 	noarch=yes
 	pkg_install() {
-		vmove usr/lib/firmware/amd-ucode
+		vmove usr/lib/firmware/amd*
 		vmove usr/lib/firmware/radeon
 		vmove usr/share/licenses/linux-firmware/LICENSE.amd-ucode
 		vmove usr/share/licenses/linux-firmware/LICENSE.radeon
@@ -49,7 +49,8 @@ linux-firmware-network_package() {
 		vmove usr/lib/firmware/brcm
 		vmove "usr/lib/firmware/cxgb*"
 		vmove "usr/lib/firmware/htc*"
-		vmove "usr/lib/firmware/i*"
+		vmove "usr/lib/firmware/iwl*"
+		vmove "usr/lib/firmware/intel*"
 		vmove usr/lib/firmware/kaweth
 		vmove usr/lib/firmware/libertas
 		vmove usr/lib/firmware/mrvl