diff --git a/packages/firmware/install b/packages/firmware/install
new file mode 100755
index 0000000000..031ef82a65
--- /dev/null
+++ b/packages/firmware/install
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+. config/options
+
+for firmware in $FIRMWARE; do
+
+  [ $firmware = iwl1000 ] && $SCRIPTS/install iwlwifi-1000-ucode
+  [ $firmware = iwl3945 ] && $SCRIPTS/install iwlwifi-3945-ucode
+  [ $firmware = iwl4965 ] && $SCRIPTS/install iwlwifi-4965-ucode
+  [ $firmware = iwl5000 ] && $SCRIPTS/install iwlwifi-5000-ucode
+  [ $firmware = iwl5150 ] && $SCRIPTS/install iwlwifi-5150-ucode
+  [ $firmware = iwl6000 ] && $SCRIPTS/install iwlwifi-6000-ucode
+
+done
diff --git a/packages/firmware/iwlwifi-1000-ucode/install b/packages/firmware/iwlwifi-1000-ucode/install
new file mode 100755
index 0000000000..489c3c2f77
--- /dev/null
+++ b/packages/firmware/iwlwifi-1000-ucode/install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+. config/options
+
+mkdir -p $INSTALL/lib/firmware
+  cp -PR $PKG_BUILD/* $INSTALL/lib/firmware
diff --git a/packages/firmware/iwlwifi-1000-ucode/url b/packages/firmware/iwlwifi-1000-ucode/url
new file mode 100644
index 0000000000..16b89a8d02
--- /dev/null
+++ b/packages/firmware/iwlwifi-1000-ucode/url
@@ -0,0 +1 @@
+http://www.intellinuxwireless.org/iwlwifi/downloads/iwlwifi-1000-ucode-128.50.3.1.tgz
\ No newline at end of file
diff --git a/packages/firmware/iwlwifi-3945-ucode/install b/packages/firmware/iwlwifi-3945-ucode/install
new file mode 100755
index 0000000000..489c3c2f77
--- /dev/null
+++ b/packages/firmware/iwlwifi-3945-ucode/install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+. config/options
+
+mkdir -p $INSTALL/lib/firmware
+  cp -PR $PKG_BUILD/* $INSTALL/lib/firmware
diff --git a/packages/firmware/iwlwifi-3945-ucode/url b/packages/firmware/iwlwifi-3945-ucode/url
new file mode 100644
index 0000000000..c13b62a60d
--- /dev/null
+++ b/packages/firmware/iwlwifi-3945-ucode/url
@@ -0,0 +1 @@
+http://www.intellinuxwireless.org/iwlwifi/downloads/iwlwifi-3945-ucode-15.32.2.9.tgz
\ No newline at end of file
diff --git a/packages/firmware/iwlwifi-4965-ucode/install b/packages/firmware/iwlwifi-4965-ucode/install
new file mode 100755
index 0000000000..489c3c2f77
--- /dev/null
+++ b/packages/firmware/iwlwifi-4965-ucode/install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+. config/options
+
+mkdir -p $INSTALL/lib/firmware
+  cp -PR $PKG_BUILD/* $INSTALL/lib/firmware
diff --git a/packages/firmware/iwlwifi-4965-ucode/url b/packages/firmware/iwlwifi-4965-ucode/url
new file mode 100644
index 0000000000..f232fab51c
--- /dev/null
+++ b/packages/firmware/iwlwifi-4965-ucode/url
@@ -0,0 +1 @@
+http://www.intellinuxwireless.org/iwlwifi/downloads/iwlwifi-4965-ucode-228.61.2.24.tgz
\ No newline at end of file
diff --git a/packages/firmware/iwlwifi-5000-ucode/install b/packages/firmware/iwlwifi-5000-ucode/install
new file mode 100755
index 0000000000..489c3c2f77
--- /dev/null
+++ b/packages/firmware/iwlwifi-5000-ucode/install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+. config/options
+
+mkdir -p $INSTALL/lib/firmware
+  cp -PR $PKG_BUILD/* $INSTALL/lib/firmware
diff --git a/packages/firmware/iwlwifi-5000-ucode/url b/packages/firmware/iwlwifi-5000-ucode/url
new file mode 100644
index 0000000000..d6b64da49e
--- /dev/null
+++ b/packages/firmware/iwlwifi-5000-ucode/url
@@ -0,0 +1 @@
+http://www.intellinuxwireless.org/iwlwifi/downloads/iwlwifi-5000-ucode-8.24.2.12.tgz
\ No newline at end of file
diff --git a/packages/firmware/iwlwifi-5150-ucode/install b/packages/firmware/iwlwifi-5150-ucode/install
new file mode 100755
index 0000000000..489c3c2f77
--- /dev/null
+++ b/packages/firmware/iwlwifi-5150-ucode/install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+. config/options
+
+mkdir -p $INSTALL/lib/firmware
+  cp -PR $PKG_BUILD/* $INSTALL/lib/firmware
diff --git a/packages/firmware/iwlwifi-5150-ucode/url b/packages/firmware/iwlwifi-5150-ucode/url
new file mode 100644
index 0000000000..964f05c132
--- /dev/null
+++ b/packages/firmware/iwlwifi-5150-ucode/url
@@ -0,0 +1 @@
+http://www.intellinuxwireless.org/iwlwifi/downloads/iwlwifi-5150-ucode-8.24.2.2.tgz
\ No newline at end of file
diff --git a/packages/firmware/iwlwifi-6000-ucode/install b/packages/firmware/iwlwifi-6000-ucode/install
new file mode 100755
index 0000000000..489c3c2f77
--- /dev/null
+++ b/packages/firmware/iwlwifi-6000-ucode/install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+. config/options
+
+mkdir -p $INSTALL/lib/firmware
+  cp -PR $PKG_BUILD/* $INSTALL/lib/firmware
diff --git a/packages/firmware/iwlwifi-6000-ucode/url b/packages/firmware/iwlwifi-6000-ucode/url
new file mode 100644
index 0000000000..f5ae87a182
--- /dev/null
+++ b/packages/firmware/iwlwifi-6000-ucode/url
@@ -0,0 +1 @@
+http://www.intellinuxwireless.org/iwlwifi/downloads/iwlwifi-6000-ucode-9.176.4.1.tgz
\ No newline at end of file
diff --git a/projects/ION/options b/projects/ION/options
index 9ede9814ff..e77f00ee24 100644
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -49,6 +49,11 @@
 # digimatrix/mceusb/mceusb2/streamzap/cx88/imonknob/ultrax/dvico/MCE-X10)
   RECEIVER=mceusb
 
+# Firmware to use (iwl1000, iwl3945, iwl4965, iwl5000, iwl5150, iwl6000)
+# Space separated list is supported, 
+# e.g. FIRMWARE="iwl3945 iwl5000"
+  FIRMWARE=""
+
 # Locales to include in the ISO
 # can be empty or a list of locale names
 # e.g. "en_US.ISO-8859-1 it_IT.UTF-8"
diff --git a/projects/intel/options b/projects/intel/options
index 05a6e3f410..dac5511ee5 100644
--- a/projects/intel/options
+++ b/projects/intel/options
@@ -49,6 +49,11 @@
 # digimatrix/mceusb/mceusb2/streamzap/cx88/imonknob/ultrax/dvico/MCE-X10)
   RECEIVER=mceusb
 
+# Firmware to use (iwl1000, iwl3945, iwl4965, iwl5000, iwl5150, iwl6000)
+# Space separated list is supported, 
+# e.g. FIRMWARE="iwl3945 iwl5000"
+  FIRMWARE="iwl5000 iwl6000"
+
 # Locales to include in the ISO
 # can be empty or a list of locale names
 # e.g. "en_US.ISO-8859-1 it_IT.UTF-8"