diff --git a/packages/linux-firmware/install b/packages/linux-firmware/install
index 9986bfd617..a54b7725c8 100755
--- a/packages/linux-firmware/install
+++ b/packages/linux-firmware/install
@@ -31,6 +31,7 @@ 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
 
diff --git a/packages/linux-firmware/zd1211-firmware/install b/packages/linux-firmware/zd1211-firmware/install
new file mode 100755
index 0000000000..3c167ddfb7
--- /dev/null
+++ b/packages/linux-firmware/zd1211-firmware/install
@@ -0,0 +1,26 @@
+#!/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 $1
+
+mkdir -p $INSTALL/lib/firmware
+  cp -P $BUILD/$PKG_NAME/zd1211* $INSTALL/lib/firmware
diff --git a/packages/linux-firmware/zd1211-firmware/meta b/packages/linux-firmware/zd1211-firmware/meta
new file mode 100644
index 0000000000..d7a3622723
--- /dev/null
+++ b/packages/linux-firmware/zd1211-firmware/meta
@@ -0,0 +1,36 @@
+################################################################################
+#      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
+################################################################################
+
+PKG_NAME="zd1211-firmware"
+PKG_VERSION="1.4"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="Free-to-use"
+PKG_SITE="http://sourceforge.net/projects/zd1211/"
+PKG_URL="$SOURCEFORGE_SRC/zd1211/$PKG_NAME/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="linux-firmware"
+PKG_SHORTDESC="zd1211-firmware: firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip Firmware"
+PKG_LONGDESC="zd1211-firmware: firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip Firmware"
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"
diff --git a/projects/ATV/options b/projects/ATV/options
index 80f463fc9a..69a2bd10d4 100644
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -184,10 +184,10 @@
 # build internal (in Kernel) or external Firmware (internal / external)"
   FIRMWARE="external"
 
-# additional Firmware to use (dvb-firmware, b43, ipw2100, ipw2200)
+# additional Firmware to use (dvb-firmware, b43, ipw2100, ipw2200, zd1211)
 # Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware, b43"
-  ADDITIONAL_FIRMWARE="dvb-firmware"
+# e.g. FIRMWARE="dvb-firmware b43"
+  ADDITIONAL_FIRMWARE="dvb-firmware zd1211"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
diff --git a/projects/Generic/options b/projects/Generic/options
index 5c4e8793cb..7913fc81c3 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -184,10 +184,10 @@
 # build internal (in Kernel) or external Firmware (internal / external)"
   FIRMWARE="external"
 
-# additional Firmware to use (dvb-firmware, b43, ipw2100, ipw2200)
+# additional Firmware to use (dvb-firmware, b43, ipw2100, ipw2200, zd1211)
 # Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware, b43"
-  ADDITIONAL_FIRMWARE="b43 ipw2100 ipw2200 dvb-firmware"
+# e.g. FIRMWARE="dvb-firmware b43"
+  ADDITIONAL_FIRMWARE="b43 ipw2100 ipw2200 dvb-firmware zd1211"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
diff --git a/projects/ION/options b/projects/ION/options
index 0c378c82a9..7ded94a380 100644
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -184,10 +184,10 @@
 # build internal (in Kernel) or external Firmware (internal / external)"
   FIRMWARE="external"
 
-# additional Firmware to use (dvb-firmware, b43, ipw2100, ipw2200)
+# additional Firmware to use (dvb-firmware, b43, ipw2100, ipw2200, zd1211)
 # Space separated list is supported,
 # e.g. FIRMWARE="dvb-firmware, b43"
-  ADDITIONAL_FIRMWARE="dvb-firmware"
+  ADDITIONAL_FIRMWARE="dvb-firmware zd1211"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
diff --git a/projects/Intel/options b/projects/Intel/options
index 15e23a756d..ddcd85159f 100644
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -184,10 +184,10 @@
 # build internal (in Kernel) or external Firmware (internal / external)"
   FIRMWARE="external"
 
-# additional Firmware to use (dvb-firmware, b43, ipw2100, ipw2200)
+# additional Firmware to use (dvb-firmware, b43, ipw2100, ipw2200, zd1211)
 # Space separated list is supported,
-# e.g. FIRMWARE="dvb-firmware, b43"
-  ADDITIONAL_FIRMWARE="b43 dvb-firmware"
+# e.g. FIRMWARE="dvb-firmware b43"
+  ADDITIONAL_FIRMWARE="b43 dvb-firmware zd1211"
 
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"