diff --git a/distributions/OpenELEC/options b/distributions/OpenELEC/options
index f4968ffdcf..b69ebdf990 100644
--- a/distributions/OpenELEC/options
+++ b/distributions/OpenELEC/options
@@ -200,11 +200,6 @@
 # This adds support for parted and mkfs.ext3/4 to initramfs for OEM usage
   INITRAMFS_PARTED_SUPPORT="no"
 
-# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
-# Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
-  FIRMWARE="misc-firmware wlan-firmware dvb-firmware"
-
 # build with swap support (yes / no)
   SWAP_SUPPORT="no"
 
diff --git a/packages/linux-firmware/iwlwifi-firmware/package.mk b/packages/linux-firmware/iwlwifi-firmware/package.mk
new file mode 100644
index 0000000000..49b9f05f9d
--- /dev/null
+++ b/packages/linux-firmware/iwlwifi-firmware/package.mk
@@ -0,0 +1,41 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+#  OpenELEC 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 of the License, or
+#  (at your option) any later version.
+#
+#  OpenELEC 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.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="iwlwifi-firmware"
+PKG_VERSION="0.0.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="Free-to-use"
+PKG_SITE="https://github.com/OpenELEC/iwlwifi-firmware"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="firmware"
+PKG_SHORTDESC="iwlwifi-firmware: firmwares for various Intel WLAN drivers"
+PKG_LONGDESC="iwlwifi-firmware: firmwares for various Intel WLAN drivers"
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+make_target() {
+  : # nothing todo
+}
+
+makeinstall_target() {
+  DESTDIR=$INSTALL ./install
+}
diff --git a/projects/Generic/options b/projects/Generic/options
index 3e04005482..50e51619e0 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -96,3 +96,9 @@
 
   # Modules to install in initramfs for early boot
     INITRAMFS_MODULES=""
+
+  # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
+  # Space separated list is supported,
+  # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
+    FIRMWARE="misc-firmware wlan-firmware dvb-firmware iwlwifi-firmware"
+
diff --git a/projects/RPi/options b/projects/RPi/options
index d9329a5e75..ffbf199271 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -113,6 +113,11 @@
   # Modules to install in initramfs for early boot
     INITRAMFS_MODULES=""
 
+  # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
+  # Space separated list is supported,
+  # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
+    FIRMWARE="misc-firmware wlan-firmware dvb-firmware"
+
   # build and install ATV IR remote support (yes / no)
     ATVCLIENT_SUPPORT="no"
 
diff --git a/projects/imx6/options b/projects/imx6/options
index 1aad303c79..1b9fd9b310 100644
--- a/projects/imx6/options
+++ b/projects/imx6/options
@@ -119,6 +119,11 @@
   # Modules to install in initramfs for early boot
     INITRAMFS_MODULES=""
 
+  # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
+  # Space separated list is supported,
+  # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
+    FIRMWARE="misc-firmware wlan-firmware dvb-firmware"
+
   # build and install ATV IR remote support (yes / no)
     ATVCLIENT_SUPPORT="no"