diff --git a/packages/linux-firmware/install b/packages/linux-firmware/install
index b6bb37415c..9986bfd617 100755
--- a/packages/linux-firmware/install
+++ b/packages/linux-firmware/install
@@ -22,24 +22,16 @@
 
 . config/options
 
-mkdir -p $INSTALL/lib/firmware
-  cp -R $PKG_BUILD/* $INSTALL/lib/firmware
-
-for firmware in $FIRMWARE; do
+if [ "$FIRMWARE" = "external" ]; then
+  mkdir -p $INSTALL/lib/firmware
+    cp -R $PKG_BUILD/* $INSTALL/lib/firmware
+fi
 
+for firmware in $ADDITIONAL_FIRMWARE; do
   [ $firmware = b43 ] && $SCRIPTS/install b43-fw
   [ $firmware = ipw2100 ] && $SCRIPTS/install ipw2100-fw
   [ $firmware = ipw2200 ] && $SCRIPTS/install ipw2200-fw
-#  [ $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
-#  [ $firmware = iwl6050 ] && $SCRIPTS/install iwlwifi-6050-ucode
-
   [ $firmware = dvb-firmware ] && $SCRIPTS/install linuxtv-dvb-firmware
-
 done
 
 exit 0
diff --git a/packages/linux/install b/packages/linux/install
index 9c439d49da..1934f31b17 100755
--- a/packages/linux/install
+++ b/packages/linux/install
@@ -37,10 +37,12 @@ for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v mo
   rm -f $i
 done
 
-# copy kernel firmwares (if present)
-mkdir -p $INSTALL/lib/firmware
-  [ -d $PKG_BUILD/modules/lib/firmware ] && \
-    cp -rf $PKG_BUILD/modules/lib/firmware/* $INSTALL/lib/firmware || true
+if [ "$FIRMWARE" = "internal" ]; then
+  # copy kernel firmwares (if present and requested)
+    mkdir -p $INSTALL/lib/firmware
+      [ -d $PKG_BUILD/modules/lib/firmware ] && \
+        cp -rf $PKG_BUILD/modules/lib/firmware/* $INSTALL/lib/firmware || true
+fi
 
 mkdir -p $INSTALL/etc
   cp $PKG_DIR/config/modules $INSTALL/etc
diff --git a/projects/ATV/options b/projects/ATV/options
index 15e9b91fe9..80f463fc9a 100644
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -181,11 +181,13 @@
 # "none" for disable LCD support
   LCD_DRIVER="none"
 
-# Firmware to use (iwl1000, iwl3945, iwl4965, iwl5000, iwl5150, iwl6000, iwl6050,
-# dvb-firmware)
+# build internal (in Kernel) or external Firmware (internal / external)"
+  FIRMWARE="external"
+
+# additional Firmware to use (dvb-firmware, b43, ipw2100, ipw2200)
 # Space separated list is supported,
-# e.g. FIRMWARE="iwl3945 iwl5000"
-  FIRMWARE="dvb-firmware"
+# e.g. FIRMWARE="dvb-firmware, b43"
+  ADDITIONAL_FIRMWARE="dvb-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
diff --git a/projects/Generic/options b/projects/Generic/options
index e21019c97a..5c4e8793cb 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -181,11 +181,13 @@
 # "none" for disable LCD support
   LCD_DRIVER="irtrans,imon"
 
-# Firmware to use (iwl1000, iwl3945, iwl4965, iwl5000, iwl5150, iwl6000, iwl6050,
-# dvb-firmware)
+# build internal (in Kernel) or external Firmware (internal / external)"
+  FIRMWARE="external"
+
+# additional Firmware to use (dvb-firmware, b43, ipw2100, ipw2200)
 # Space separated list is supported,
-# e.g. FIRMWARE="iwl3945 iwl5000"
-  FIRMWARE="ipw2100 ipw2200 iwl1000 iwl3945 iwl4965 iwl5000 iwl5150 iwl6000 iwl6050 dvb-firmware"
+# e.g. FIRMWARE="dvb-firmware, b43"
+  ADDITIONAL_FIRMWARE="b43 ipw2100 ipw2200 dvb-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
diff --git a/projects/ION/options b/projects/ION/options
index 32d9f32548..0c378c82a9 100644
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -181,11 +181,13 @@
 # "none" for disable LCD support
   LCD_DRIVER="irtrans,imon"
 
-# Firmware to use (iwl1000, iwl3945, iwl4965, iwl5000, iwl5150, iwl6000, iwl6050,
-# dvb-firmware)
+# build internal (in Kernel) or external Firmware (internal / external)"
+  FIRMWARE="external"
+
+# additional Firmware to use (dvb-firmware, b43, ipw2100, ipw2200)
 # Space separated list is supported,
-# e.g. FIRMWARE="iwl3945 iwl5000"
-  FIRMWARE="dvb-firmware"
+# e.g. FIRMWARE="dvb-firmware, b43"
+  ADDITIONAL_FIRMWARE="dvb-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
diff --git a/projects/Intel/options b/projects/Intel/options
index dc76b21c99..15e23a756d 100644
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -181,11 +181,13 @@
 # "none" for disable LCD support
   LCD_DRIVER="irtrans,imon"
 
-# Firmware to use (iwl1000, iwl3945, iwl4965, iwl5000, iwl5150, iwl6000, iwl6050,
-# Firmware to use (iwl1000, iwl3945, iwl4965, iwl5000, iwl5150, iwl6000, iwl6050)
+# build internal (in Kernel) or external Firmware (internal / external)"
+  FIRMWARE="external"
+
+# additional Firmware to use (dvb-firmware, b43, ipw2100, ipw2200)
 # Space separated list is supported,
-# e.g. FIRMWARE="iwl3945 iwl5000"
-  FIRMWARE="iwl4965 iwl5000 dvb-firmware"
+# e.g. FIRMWARE="dvb-firmware, b43"
+  ADDITIONAL_FIRMWARE="b43 dvb-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"