diff --git a/srcpkgs/linux-firmware-network b/srcpkgs/linux-firmware-network
new file mode 120000
index 00000000000..9a0010a89de
--- /dev/null
+++ b/srcpkgs/linux-firmware-network
@@ -0,0 +1 @@
+linux-firmware
\ No newline at end of file
diff --git a/srcpkgs/linux-firmware/linux-firmware-network.template b/srcpkgs/linux-firmware/linux-firmware-network.template
new file mode 100644
index 00000000000..8caa6680d73
--- /dev/null
+++ b/srcpkgs/linux-firmware/linux-firmware-network.template
@@ -0,0 +1,26 @@
+# Template file for 'linux-firmware-network'.
+#
+short_desc="${short_desc} for network modules"
+long_desc="${long_desc}
+
+ This package contains only the required firmware files for the
+ Network modules."
+
+noarch=yes
+
+do_install() {
+	# 3Com
+	vmove lib/firmware/3com lib/firmware
+	# Realtek
+	vmove lib/firmware/RTL8192E lib/firmware
+	vmove "lib/firmware/rt*" lib/firmware
+	# Atheros
+	vmove "lib/firmware/ath*" lib/firmware
+	vmove "lib/firmware/ar*" lib/firmware
+	# bnx2
+	vmove "lib/firmware/bnx2*" lib/firmware
+	# Broadcom
+	vmove lib/firmware/brcm lib/firmware
+	# Intel
+	vmove "lib/firmware/i*" lib/firmware
+}
diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template
index 9501c1a97c6..bb493de5c52 100644
--- a/srcpkgs/linux-firmware/template
+++ b/srcpkgs/linux-firmware/template
@@ -19,6 +19,10 @@ iwl3945-firmware>=0 iwl4965-firmware>=0 iwl5000-firmware>=0 rt73usb-firmware>=0
 iwl5150-firmware>=0 iwl6000-firmware>=0 rt2800usb>=0 rt61-firmware>=0
 ar9170-firmware>=0"
 
+subpackages="${pkgname}-network"
+
+Add_dependency run ${pkgname}-network ">=${version}"
+
 Add_dependency build coreutils
 Add_dependency build wget
 Add_dependency build git
@@ -36,6 +40,7 @@ do_install() {
 	rm -f ${DESTDIR}/lib/firmware/GPL{,-3}
 	mv ${DESTDIR}/lib/firmware/{LICEN*,WHENCE} \
 		${DESTDIR}/usr/share/licenses/${pkgname}
-	wget http://anonscm.debian.org/viewvc/kernel/dists/squeeze/firmware-nonfree/atheros/ar9170.fw?view=co \
-		-O ${DESTDIR}/lib/firmware/ar9170.fw
+	# XXX disabled for now, reenable when it works.
+	#wget http://anonscm.debian.org/viewvc/kernel/dists/squeeze/firmware-nonfree/atheros/ar9170.fw?view=co \
+	#	-O ${DESTDIR}/lib/firmware/ar9170.fw
 }