diff --git a/packages/linux-firmware/install b/packages/linux-firmware/install
deleted file mode 100755
index a54b7725c8..0000000000
--- a/packages/linux-firmware/install
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options
-
-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 = zd1211 ] && $SCRIPTS/install zd1211-firmware
-  [ $firmware = dvb-firmware ] && $SCRIPTS/install linuxtv-dvb-firmware
-done
-
-exit 0
diff --git a/packages/linux-firmware/meta b/packages/linux-firmware/meta
index 8043b8e851..fc2d2d1a45 100644
--- a/packages/linux-firmware/meta
+++ b/packages/linux-firmware/meta
@@ -18,19 +18,19 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="linux-firmware"
-PKG_VERSION="20110222"
+PKG_NAME="firmware"
+PKG_VERSION=""
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=tree"
-PKG_URL="http://www.kernel.org/pub/linux/kernel/people/dwmw2/firmware/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS=""
+PKG_SITE=""
+PKG_URL=""
+PKG_DEPENDS="$FIRMWARE"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
-PKG_SECTION="linux-firmware"
-PKG_SHORTDESC="linux-firmware: various free firmware drivers"
-PKG_LONGDESC="linux-firmware is a package to install various free firmware drivers"
+PKG_SECTION="firmware"
+PKG_SHORTDESC="firmware: various free firmware drivers"
+PKG_LONGDESC="firmware is a meta-package to install various free firmware drivers"
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
diff --git a/packages/linux/install b/packages/linux/install
index 1934f31b17..052eec44cd 100755
--- a/packages/linux/install
+++ b/packages/linux/install
@@ -37,12 +37,10 @@ for i in `ls $INSTALL/lib/modules/*/modules.* | grep -v modules.dep | grep -v mo
   rm -f $i
 done
 
-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
+# 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
 
 mkdir -p $INSTALL/etc
   cp $PKG_DIR/config/modules $INSTALL/etc
diff --git a/projects/ATV/options b/projects/ATV/options
index 69a2bd10d4..68f3d52129 100644
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -181,13 +181,10 @@
 # "none" for disable LCD support
   LCD_DRIVER="none"
 
-# build internal (in Kernel) or external Firmware (internal / external)"
-  FIRMWARE="external"
-
-# additional Firmware to use (dvb-firmware, b43, ipw2100, ipw2200, zd1211)
+# additional Firmware to use (dvb-firmware, wlan-firmware)
 # Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware b43"
-  ADDITIONAL_FIRMWARE="dvb-firmware zd1211"
+# e.g. FIRMWARE="dvb-firmware, wlan-firmware"
+  FIRMWARE="dvb-firmware wlan-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
diff --git a/projects/Generic/options b/projects/Generic/options
index 7913fc81c3..b09d15d9e3 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -181,13 +181,10 @@
 # "none" for disable LCD support
   LCD_DRIVER="irtrans,imon"
 
-# build internal (in Kernel) or external Firmware (internal / external)"
-  FIRMWARE="external"
-
-# additional Firmware to use (dvb-firmware, b43, ipw2100, ipw2200, zd1211)
+# additional Firmware to use (dvb-firmware, wlan-firmware)
 # Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware b43"
-  ADDITIONAL_FIRMWARE="b43 ipw2100 ipw2200 dvb-firmware zd1211"
+# e.g. FIRMWARE="dvb-firmware, wlan-firmware"
+  FIRMWARE="dvb-firmware wlan-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
diff --git a/projects/ION/options b/projects/ION/options
index 7ded94a380..97ed1da186 100644
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -181,13 +181,10 @@
 # "none" for disable LCD support
   LCD_DRIVER="irtrans,imon"
 
-# build internal (in Kernel) or external Firmware (internal / external)"
-  FIRMWARE="external"
-
-# additional Firmware to use (dvb-firmware, b43, ipw2100, ipw2200, zd1211)
+# additional Firmware to use (dvb-firmware, wlan-firmware)
 # Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware, b43"
-  ADDITIONAL_FIRMWARE="dvb-firmware zd1211"
+# e.g. FIRMWARE="dvb-firmware, wlan-firmware"
+  FIRMWARE="dvb-firmware wlan-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
diff --git a/projects/Intel/options b/projects/Intel/options
index ddcd85159f..d5071596ee 100644
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -181,13 +181,10 @@
 # "none" for disable LCD support
   LCD_DRIVER="irtrans,imon"
 
-# build internal (in Kernel) or external Firmware (internal / external)"
-  FIRMWARE="external"
-
-# additional Firmware to use (dvb-firmware, b43, ipw2100, ipw2200, zd1211)
+# additional Firmware to use (dvb-firmware, wlan-firmware)
 # Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware b43"
-  ADDITIONAL_FIRMWARE="b43 dvb-firmware zd1211"
+# e.g. FIRMWARE="dvb-firmware, wlan-firmware"
+  FIRMWARE="dvb-firmware wlan-firmware"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"