diff --git a/packages/audio/alsa-utils/install b/packages/audio/alsa-utils/install
index 59b99a6195..907dd734dd 100755
--- a/packages/audio/alsa-utils/install
+++ b/packages/audio/alsa-utils/install
@@ -34,5 +34,3 @@ mkdir -p $INSTALL/usr/share/alsa/init
   cp $PKG_BUILD/alsactl/init/* $INSTALL/usr/share/alsa/init
   rm -rf $INSTALL/usr/share/alsa/init/Makefile*
 
- mkdir -p $INSTALL/lib/udev/rules.d
-   cp $PKG_DIR/config/rules.d/* $INSTALL/lib/udev/rules.d
diff --git a/packages/audio/alsa-utils/config/rules.d/40-alsa.rules b/packages/audio/alsa-utils/udev.d/40-alsa.rules
similarity index 100%
rename from packages/audio/alsa-utils/config/rules.d/40-alsa.rules
rename to packages/audio/alsa-utils/udev.d/40-alsa.rules
diff --git a/packages/devel/attr/build b/packages/devel/attr/build
new file mode 100755
index 0000000000..a267422a13
--- /dev/null
+++ b/packages/devel/attr/build
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2010-2011 Roman Weber (roman@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
+
+cd $PKG_BUILD
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --exec-prefix=/usr \
+            --sysconfdir=/etc \
+            --datadir=/usr/share \
+            --enable-shared \
+            --disable-static \
+
+make
+
+cp -P libattr/.libs/*.so* $SYSROOT_PREFIX/usr/lib/
diff --git a/packages/devel/attr/install b/packages/devel/attr/install
new file mode 100755
index 0000000000..9c4beb8005
--- /dev/null
+++ b/packages/devel/attr/install
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2010-2011 Roman Weber (roman@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/usr/lib
+  cp -P $PKG_BUILD/libattr/.libs/*.so* $INSTALL/usr/lib
+
diff --git a/packages/devel/attr/meta b/packages/devel/attr/meta
new file mode 100644
index 0000000000..8c5c6c0054
--- /dev/null
+++ b/packages/devel/attr/meta
@@ -0,0 +1,35 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2010-2011 Roman Weber (roman@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="attr"
+PKG_VERSION="2.4.44"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE=""
+PKG_URL="http://download.savannah.gnu.org/releases-noredirect/attr/$PKG_NAME-$PKG_VERSION.src.tar.gz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="accessibility"
+PKG_SHORTDESC="attr: Extended Attributes Of Filesystem Objects"
+PKG_LONGDESC="Extended attributes are name:value pairs associated permanently with files and directories, similar to the environment strings associated with a process. An attribute may be defined or undefined. If it is defined, its value may be empty or non-empty. Extended attributes are extensions to the normal attributes which are associated with all inodes in the system (i.e. the stat(2) data). They are often used to provide additional functionality to a filesystem - for example, additional security features such as Access Control Lists (ACLs) may be implemented using extended attributes."
+PKG_IS_ADDON="no"
diff --git a/packages/devel/libcap/build b/packages/devel/libcap/build
new file mode 100755
index 0000000000..a201d162f1
--- /dev/null
+++ b/packages/devel/libcap/build
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2010-2011 Roman Weber (roman@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
+
+cd $PKG_BUILD
+
+setup_toolchain host
+
+make CC=$HOST_CC -C libcap _makenames
+
+setup_toolchain target
+
+make CC=$TARGET_CC
+
+$MAKEINSTALL -j1 RAISE_SETFCAP=no
diff --git a/packages/devel/libcap/install b/packages/devel/libcap/install
new file mode 100755
index 0000000000..3f075cb86c
--- /dev/null
+++ b/packages/devel/libcap/install
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2010-2011 Roman Weber (roman@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/usr/lib
+  cp -P $PKG_BUILD/libcap/*.so* $INSTALL/usr/lib
diff --git a/packages/devel/libcap/meta b/packages/devel/libcap/meta
new file mode 100644
index 0000000000..e6ba0f6a98
--- /dev/null
+++ b/packages/devel/libcap/meta
@@ -0,0 +1,35 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2010-2011 Roman Weber (roman@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="libcap"
+PKG_VERSION="2.20"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE=""
+PKG_URL="http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="attr"
+PKG_BUILD_DEPENDS="toolchain attr"
+PKG_PRIORITY="optional"
+PKG_SECTION="devel"
+PKG_SHORTDESC="libcap: A library for getting and setting POSIX.1e capabilities"
+PKG_LONGDESC="As of Linux 2.2.0, the power of the superuser has been partitioned into a set of discrete capabilities (in other places, these capabilities are know as privileges). The contents of the libcap package are a library and a number of simple programs that are intended to show how an application/daemon can be protected (with wrappers) or rewritten to take advantage of this fine grained approach to constraining the danger to your system from programs running as 'root'."
+PKG_IS_ADDON="no"
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..7ac8358f70
--- /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/zd1211
+  cp -P $BUILD/$PKG_NAME/zd1211* $INSTALL/lib/firmware/zd1211
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/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta
index ddeba69e43..69685816f1 100644
--- a/packages/mediacenter/xbmc-theme-Confluence/meta
+++ b/packages/mediacenter/xbmc-theme-Confluence/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="10.0-Dharma"
+PKG_VERSION="Dharma-10.1-c8405db"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index 67165283d5..a204715ec7 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -119,7 +119,7 @@ do_autoreconf xbmc/lib/libid3tag/libid3tag
             --exec-prefix=/usr \
             --sysconfdir=/etc \
             --datadir=/usr/share \
-            SVN_REV=`cat svn.version` \
+            GIT_REV=`cat git.version` \
             --disable-debug \
             --disable-optimizations \
             --enable-gl \
diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install
index da2bc4376a..58d9f182bf 100755
--- a/packages/mediacenter/xbmc/install
+++ b/packages/mediacenter/xbmc/install
@@ -40,7 +40,7 @@ cd $PKG_BUILD
     -iregex ".*-linux.*|.*\.vis|.*\.xbs" \
     -exec install -D "{}" $ROOT/$INSTALL/usr/lib/xbmc/"{}" ";"
 
-  find addons language media scripts sounds userdata system \
+  find addons language media sounds userdata system \
     -regextype posix-extended -type f \
     -not -iregex ".*-linux.*|.*\.vis|.*\.xbs|.*svn.*|.*\.orig|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib" \
     -exec install -D -m 0644 "{}" $ROOT/$INSTALL/usr/share/xbmc/"{}" ";"
@@ -73,8 +73,6 @@ if [ "$WIIMOTE_SUPPORT" = yes ]; then
     cp $PKG_BUILD/tools/EventClients/Clients/WiiRemote/WiiUse_WiiRemote $INSTALL/usr/bin/xbmc-wiiremote
   mkdir -p $INSTALL/lib/udev
     cp $PKG_DIR/scripts/wiiremote_helper $INSTALL/lib/udev
-  mkdir -p $INSTALL/lib/udev/rules.d
-    cp $PKG_DIR/rules.d/98-wiiremote.rules $INSTALL/lib/udev/rules.d
 fi
 
 if [ "$PS3REMOTE_SUPPORT" = yes ]; then
@@ -86,6 +84,4 @@ if [ "$PS3REMOTE_SUPPORT" = yes ]; then
    echo 'ICON_PATH="/usr/share/pixmaps/xbmc/"' > $PYTHON_LIBDIR/site-packages/xbmc/defs.py
   mkdir -p $INSTALL/lib/udev
     cp $PKG_DIR/scripts/ps3remote_helper $INSTALL/lib/udev
-  mkdir -p $INSTALL/lib/udev/rules.d
-    cp $PKG_DIR/rules.d/98-ps3remote.rules $INSTALL/lib/udev/rules.d
 fi
diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta
index 22e3bd97ba..bccdf12252 100644
--- a/packages/mediacenter/xbmc/meta
+++ b/packages/mediacenter/xbmc/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="10.0-Dharma"
+PKG_VERSION="Dharma-10.1-c8405db"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-301-correct_lzo_include-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-301-correct_lzo_include-0.1.patch
deleted file mode 100644
index d9b5732f81..0000000000
--- a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-301-correct_lzo_include-0.1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
---- xbmc-31903/configure.in	2010-07-17 16:50:02.838501479 +0200
-+++ xbmc-31903.patch/configure.in	2010-07-17 16:50:20.633376618 +0200
-@@ -1205,12 +1205,6 @@
-   final_message="$final_message\n  MID Support:\tNo"
- fi
- 
--if test -d "/usr/include/lzo"; then
--  INCLUDES="$INCLUDES -I/usr/include/lzo"
--else
--  INCLUDES="$INCLUDES"
--fi
--
- if test "x$use_ccache" != "xno"; then
-   AC_PATH_PROG(CCACHE,ccache,none)
-   if test "$ac_cv_path_CCACHE" = "none"; then
-diff -Naur xbmc-31903/tools/TexturePacker/XBMCTex.cpp xbmc-31903.patch/tools/TexturePacker/XBMCTex.cpp
---- xbmc-31903/tools/TexturePacker/XBMCTex.cpp	2010-07-17 16:28:40.000000000 +0200
-+++ xbmc-31903.patch/tools/TexturePacker/XBMCTex.cpp	2010-07-17 16:50:20.634375824 +0200
-@@ -37,7 +37,7 @@
- #endif
- 
- #ifdef _LINUX
--#include <lzo1x.h>
-+#include <lzo/lzo1x.h>
- #else
- #include "../../xbmc/lib/liblzo/LZO1X.H"
- #endif
diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-303-WiiRemote_crosscompiling-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-303-WiiRemote_crosscompiling-0.1.patch
deleted file mode 100644
index e63840a6da..0000000000
--- a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-303-WiiRemote_crosscompiling-0.1.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -Naur xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/Makefile xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/Makefile
---- xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/Makefile	2010-09-19 14:54:08.000000000 +0200
-+++ xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/Makefile	2010-09-21 20:31:58.649299449 +0200
-@@ -1,3 +1,4 @@
-+CXX ?= g++
- CFLAGS = -Wall -pipe -fPIC -funroll-loops
- OBJ_DIR = release-$(shell $(CC) -v 2>&1|grep ^Target:|cut -d' ' -f2)
- OBJS = wiiuse_v0.12/src/$(OBJ_DIR)/libwiiuse.so
-@@ -6,7 +7,7 @@
- 
- all:
- 	@$(MAKE) -C wiiuse_$(VERSION)/src $@
--	g++ $(CFLAGS) WiiUse_WiiRemote.cpp $(OBJS) -o $(BIN)
-+	$(CXX) $(CFLAGS) -I./wiiuse_$(VERSION)/src WiiUse_WiiRemote.cpp $(OBJS) -o $(BIN)
- wiiuse:
- 	@$(MAKE) -C wiiuse_$(VERSION)/src
- clean:
-diff -Naur xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile
---- xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile	2010-09-19 14:54:08.000000000 +0200
-+++ xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile	2010-09-21 20:28:15.388265664 +0200
-@@ -5,7 +5,7 @@
- #
- # Change this to your GCC version.
- #
--CC = gcc
-+CC ?= gcc
- 
- ####################################################
- #
-diff -Naur xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile
---- xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile	2010-09-19 14:54:08.000000000 +0200
-+++ xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile	2010-09-21 20:28:22.476390252 +0200
-@@ -5,7 +5,7 @@
- #
- # Change this to your GCC version.
- #
--CC = gcc
-+CC ?= gcc
- 
- ####################################################
- #
-diff -Naur xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile
---- xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile	2010-09-19 14:54:08.000000000 +0200
-+++ xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile	2010-09-21 20:28:32.447265813 +0200
-@@ -5,7 +5,7 @@
- #
- # Change this to your GCC version.
- #
--CC = gcc
-+CC ?= gcc
- 
- ####################################################
- #
diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-303-fix_libdvd_xFLAGS-0.1.patch
deleted file mode 100644
index d3155b02bc..0000000000
--- a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-303-fix_libdvd_xFLAGS-0.1.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in
---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in	2010-09-04 04:22:52.000000000 +0200
-+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in	2010-09-06 00:34:45.247116875 +0200
-@@ -6,5 +6,5 @@
- Name: libdvdcss
- Description: DVD access and decryption library.
- Version: @VERSION@
--Libs: -L${libdir} -ldvdcss
--Cflags: -I{includedir} -I${includedir}/@PACKAGE@
-+Libs: -ldvdcss
-+Cflags: -I.
-diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh
---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh	2010-09-04 04:22:50.000000000 +0200
-+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh	2010-09-06 00:30:38.943396556 +0200
-@@ -56,17 +56,17 @@
- fi
- 
- if test "$echo_cflags" = "yes"; then
--      echo -I$prefix/include $dvdread_cflags $extracflags $threadcflags
-+      echo $dvdread_cflags $extracflags $threadcflags
- fi
- 
- if test "$echo_minicflags" = "yes"; then
--      echo -I$prefix/include -I$prefix/include/dvdnav $extracflags $threadcflags
-+      echo $extracflags $threadcflags
- fi
- 
- if test "$echo_libs" = "yes"; then
--      echo -L$libdir -ldvdnav $dvdread_libs $threadlib
-+      echo -ldvdnav $dvdread_libs $threadlib
- fi      
- 
- if test "$echo_minilibs" = "yes"; then
--      echo -L$libdir -ldvdnavmini $threadlib
-+      echo -ldvdnavmini $threadlib
- fi
-diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in
---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in	2010-09-04 04:22:50.000000000 +0200
-+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in	2010-09-06 00:31:04.643116783 +0200
-@@ -76,13 +76,13 @@
- fi
- 
- if test "$echo_cflags" = "yes"; then
--      echo -I@includedir@ -I@includedir@/libdvdread @THREAD_CFLAGS@
-+      echo @THREAD_CFLAGS@
- fi
- 
- if test "$echo_libs" = "yes"; then
--      echo -L@libdir@ -ldvdnav -ldvdread @THREAD_LIBS@
-+      echo -ldvdnav -ldvdread @THREAD_LIBS@
- fi
- 
- if test "$echo_minilibs" = "yes"; then
--      echo -L@libdir@ -ldvdnavmini @THREAD_LIBS@
-+      echo -ldvdnavmini @THREAD_LIBS@
- fi      
-diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in
---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in	2010-09-04 04:22:50.000000000 +0200
-+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in	2010-09-06 00:31:31.665116765 +0200
-@@ -7,5 +7,5 @@
- Description: DVD Navigation mini library
- Version: @VERSION@
- 
--Cflags: -I${includedir} @DVDREAD_CFLAGS@ @THREAD_CFLAGS@
--Libs: -L${libdir} -ldvdnav @THREAD_LIBS@
-+Cflags: @DVDREAD_CFLAGS@ @THREAD_CFLAGS@
-+Libs: -ldvdnav @THREAD_LIBS@
-diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in
---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in	2010-09-04 04:22:50.000000000 +0200
-+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in	2010-09-06 00:31:18.193116906 +0200
-@@ -8,5 +8,5 @@
- Version: @VERSION@
- 
- Requires.private: dvdread >= 4.1.2
--Cflags: -I${includedir} @THREAD_CFLAGS@
--Libs: -L${libdir} -ldvdnav @THREAD_LIBS@
-+Cflags: @THREAD_CFLAGS@
-+Libs: -ldvdnav @THREAD_LIBS@
-diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in
---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in	2010-09-04 04:22:51.000000000 +0200
-+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in	2010-09-06 00:32:18.255991830 +0200
-@@ -72,9 +72,9 @@
- fi
- 
- if test "$echo_cflags" = "yes"; then
--      echo -I@includedir@
-+      echo ""
- fi
- 
- if test "$echo_libs" = "yes"; then
--      echo -L@libdir@ -ldvdread
-+      echo -ldvdread
- fi
-diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh
---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh	2010-09-04 04:22:51.000000000 +0200
-+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh	2010-09-06 00:32:35.283991243 +0200
-@@ -48,9 +48,9 @@
- fi
- 
- if test "$echo_cflags" = "yes"; then
--      echo -I$prefix/include $extracflags
-+      echo $extracflags
- fi
- 
- if test "$echo_libs" = "yes"; then
--      echo -L$libdir $dvdreadlib
-+      echo $dvdreadlib
- fi      
-diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in
---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in	2010-09-04 04:22:51.000000000 +0200
-+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in	2010-09-06 00:32:57.831991741 +0200
-@@ -7,5 +7,5 @@
- Description: Low level DVD access library
- Version: @VERSION@
- 
--Cflags: -I${includedir}
--Libs: -L${libdir} -ldvdread
-+Cflags: -I.
-+Libs: -ldvdread
diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-321-CrystalHD_use_yuy2_to_yv12-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-321-CrystalHD_use_yuy2_to_yv12-0.1.patch
deleted file mode 100644
index 2526f8e3ba..0000000000
--- a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-321-CrystalHD_use_yuy2_to_yv12-0.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur xbmc-10.0-Dharma/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp xbmc-10.0-Dharma.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp
---- xbmc-10.0-Dharma/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp	2010-12-17 20:14:04.000000000 +0100
-+++ xbmc-10.0-Dharma.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp	2011-01-21 13:52:11.238550146 +0100
-@@ -773,7 +773,7 @@
-           if (!pBuffer)
-           {
-             // No free pre-allocated buffers so make one
--#ifdef _WIN32
-+#if 1
-             // force Windows to use YV12 until DX renderer gets NV12 or YUY2 capability.
-             pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUV420P, m_width, m_height);
- #else
diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-402-enable_yasm_in_ffmpeg-0.1.patch
deleted file mode 100644
index f2db6fd5a2..0000000000
--- a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-402-enable_yasm_in_ffmpeg-0.1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
---- xbmc-31903/configure.in	2010-07-17 16:53:28.281376543 +0200
-+++ xbmc-31903.patch/configure.in	2010-07-17 16:55:45.481375135 +0200
-@@ -1045,6 +1045,7 @@
-   fi
- fi
- 
-+AC_CHECK_PROG(HAVE_YASM,yasm,"yes","no",)
- AC_CHECK_PROG(HAVE_SVNVERSION,svnversion,"yes","no",)
- AC_CHECK_PROG(HAVE_GIT,git,"yes","no",)
- 
-@@ -1639,6 +1640,7 @@
-       `if test "$use_arch" != "no"; then echo --arch=$use_arch; fi`\
-       `if test "$use_cpu" != "no"; then echo --cpu=$use_cpu; fi`\
-       --target-os=$(tolower $(uname -s)) \
-+      `if test "$HAVE_YASM" = "yes"; then echo --enable-yasm; fi` \
-       --disable-muxers \
-       --enable-muxer=spdif \
-       --enable-muxer=adts \
diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-501-fixed_bitstream_mode_improperly_set-Ticket-10981.patch b/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-501-fixed_bitstream_mode_improperly_set-Ticket-10981.patch
deleted file mode 100644
index a77ad31d11..0000000000
--- a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-501-fixed_bitstream_mode_improperly_set-Ticket-10981.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur xbmc-10.0-Dharma/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/spdif.c xbmc-10.0-Dharma.patch/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/spdif.c
---- xbmc-10.0-Dharma/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/spdif.c	2010-12-17 20:13:36.000000000 +0100
-+++ xbmc-10.0-Dharma.patch/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/spdif.c	2011-01-07 01:19:48.721555949 +0100
-@@ -108,7 +108,7 @@
- static int spdif_header_ac3(AVFormatContext *s, AVPacket *pkt)
- {
-     IEC958Context *ctx = s->priv_data;
--    int bitstream_mode = pkt->data[6] & 0x7;
-+    int bitstream_mode = pkt->data[5] & 0x7;
- 
-     ctx->data_type  = IEC958_AC3 | (bitstream_mode << 8);
-     ctx->pkt_offset = AC3_FRAME_SIZE << 2;
diff --git a/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-001-add_support_to_specify_GIT_REV-0.1.patch
new file mode 100644
index 0000000000..0845395f43
--- /dev/null
+++ b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-001-add_support_to_specify_GIT_REV-0.1.patch
@@ -0,0 +1,40 @@
+diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in
+--- xbmc-Dharma-10.1-c8405db/configure.in	2011-02-15 13:30:17.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/configure.in	2011-02-15 19:08:46.445385047 +0100
+@@ -387,6 +387,15 @@
+      AC_MSG_ERROR(unsupported host ($host))
+ esac
+ AC_SUBST([ARCH])
++
++AC_CHECK_PROG(HAVE_GIT,git,"yes","no",)
++if test "$HAVE_GIT" = "yes" -a "$GIT_REV" = ""; then
++  GIT_REV=$(git rev-parse --short HEAD)
++elif test "$GIT_REV" = ""; then
++  GIT_REV="Unknown"
++fi
++final_message="$final_message\n  git Rev.:\t${GIT_REV}"
++
+ if test "$use_debug" = "yes"; then
+   final_message="$final_message\n  Debugging:\tYes"
+   if test "$use_profiling" = "yes"; then
+@@ -1097,7 +1106,6 @@
+   fi
+ fi
+ 
+-AC_CHECK_PROG(HAVE_GIT,git,"yes","no",)
+ 
+ # Checks for header files.
+ AC_HEADER_DIRENT
+@@ -1282,12 +1290,6 @@
+   final_message="$final_message\n  Avahi:\tNo"
+ fi
+ 
+-if test "$HAVE_GIT" = "yes"; then
+-  GIT_REV=$(git rev-parse --short HEAD)
+-fi
+-if test "$GIT_REV" = ""; then
+-  GIT_REV="Unknown"
+-fi
+ if test "$host_vendor" = "apple"; then
+   echo "#define GIT_REV \"$GIT_REV\"" > git_revision.h
+ else
diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-002-arm_remove_forced_python2.5-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-002-arm_remove_forced_python2.5-0.1.patch
similarity index 56%
rename from packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-002-arm_remove_forced_python2.5-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-002-arm_remove_forced_python2.5-0.1.patch
index f90ee1faa0..dd64a43cc7 100644
--- a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-002-arm_remove_forced_python2.5-0.1.patch
+++ b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-002-arm_remove_forced_python2.5-0.1.patch
@@ -1,7 +1,7 @@
-diff -Naur xbmc-dharma-35100/Makefile.in xbmc-dharma-35100.patch/Makefile.in
---- xbmc-dharma-35100/Makefile.in	2010-10-30 05:36:41.000000000 +0200
-+++ xbmc-dharma-35100.patch/Makefile.in	2010-11-01 04:53:48.542705631 +0100
-@@ -471,11 +471,6 @@
+diff -Naur xbmc-Dharma-10.1-c8405db/Makefile.in xbmc-Dharma-10.1-c8405db.patch/Makefile.in
+--- xbmc-Dharma-10.1-c8405db/Makefile.in	2011-02-15 13:30:17.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/Makefile.in	2011-02-15 13:55:18.511016755 +0100
+@@ -466,11 +466,6 @@
  	xbmc/cores/DllLoader/exports/util/exports_utils.a \
  	xbmc/cores/DllLoader/exports/exports.a
  
diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-201-let_select_XBMCProjectM-0.1.patch
similarity index 76%
rename from packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-201-let_select_XBMCProjectM-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-201-let_select_XBMCProjectM-0.1.patch
index 8da9696e60..599268596c 100644
--- a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-201-let_select_XBMCProjectM-0.1.patch
+++ b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-201-let_select_XBMCProjectM-0.1.patch
@@ -1,7 +1,7 @@
-diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
---- xbmc-31903/configure.in	2010-07-17 16:25:37.000000000 +0200
-+++ xbmc-31903.patch/configure.in	2010-07-17 16:46:16.387376489 +0200
-@@ -23,6 +23,8 @@
+diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in
+--- xbmc-Dharma-10.1-c8405db/configure.in	2011-02-15 13:30:17.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/configure.in	2011-02-15 13:57:02.105903186 +0100
+@@ -65,6 +65,8 @@
  xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. =="
  goom_enabled="== GOOM enabled. =="
  goom_disabled="== GOOM disabled. =="
@@ -10,7 +10,7 @@ diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
  pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
  pulse_disabled="== PulseAudio support manually disabled. =="
  faac_not_found="== Could not find libfaac. FAAC support disabled. =="
-@@ -161,6 +163,12 @@
+@@ -204,6 +206,12 @@
    [use_goom=$enableval],
    [use_goom=no])
  
@@ -23,9 +23,9 @@ diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
  AC_ARG_ENABLE([ccache],
    [AS_HELP_STRING([--enable-ccache],
    [enable building with ccache feature (default is auto)])],
-@@ -725,6 +733,15 @@
- AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],use_librtmp=yes,
- use_librtmp=no;AC_MSG_RESULT($librtmp_not_found))
+@@ -832,6 +840,15 @@
+   AC_MSG_NOTICE($librtmp_disabled)
+ fi
  
 +# XBMCPROJECTM
 +if test "$use_xbmcprojectm" = "yes"; then
@@ -39,8 +39,8 @@ diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
  ### External libraries checks
  # External FFmpeg
  if test "$use_external_ffmpeg" = "yes"; then
-@@ -1132,6 +1149,12 @@
-   final_message="$final_message\n  GOOM:\t\tNo"
+@@ -1210,6 +1227,12 @@
+   final_message="$final_message\n  Bluray:\tNo"
  fi
  
 +if test "$use_xbmcprojectm" = "yes"; then
@@ -52,7 +52,7 @@ diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
  if test "$use_mid" = "yes"; then
    final_message="$final_message\n  MID Support:\tYes"
    SDL_DEFINES="$SDL_DEFINES -DMID"
-@@ -1401,6 +1424,7 @@
+@@ -1474,6 +1497,7 @@
  AC_SUBST(SDL_DEFINES)
  AC_SUBST(BUILD_DVDCSS)
  AC_SUBST(BUILD_GOOM)
@@ -60,7 +60,7 @@ diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
  AC_SUBST(USE_EXTERNAL_FFMPEG)
  AC_SUBST(USE_EXTERNAL_LIBA52)
  AC_SUBST(USE_INTERNAL_LIBA52)
-@@ -1788,7 +1812,7 @@
+@@ -1870,7 +1894,7 @@
        -DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" .
  set +x
    fi
@@ -69,10 +69,10 @@ diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
  
  XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
    if test "$host_vendor" != "apple" ; then
-diff -Naur xbmc-31903/Makefile.in xbmc-31903.patch/Makefile.in
---- xbmc-31903/Makefile.in	2010-07-17 16:25:37.000000000 +0200
-+++ xbmc-31903.patch/Makefile.in	2010-07-17 16:46:16.391376663 +0200
-@@ -108,8 +108,10 @@
+diff -Naur xbmc-Dharma-10.1-c8405db/Makefile.in xbmc-Dharma-10.1-c8405db.patch/Makefile.in
+--- xbmc-Dharma-10.1-c8405db/Makefile.in	2011-02-15 13:56:41.203329597 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/Makefile.in	2011-02-15 13:57:02.107903144 +0100
+@@ -109,8 +109,10 @@
  
  VIS_DIRS=\
  	xbmc/visualizations/OpenGLSpectrum \
@@ -85,7 +85,7 @@ diff -Naur xbmc-31903/Makefile.in xbmc-31903.patch/Makefile.in
  ifeq ($(findstring osx,$(ARCH)), osx)
  VIS_DIRS+=xbmc/visualizations/iTunes
  endif
-@@ -307,7 +309,9 @@
+@@ -308,7 +310,9 @@
  ifneq (arm, $(ARCH))
  	$(MAKE) -C xbmc/visualizations/OpenGLSpectrum
  	$(MAKE) -C xbmc/visualizations/WaveForm
diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-202-let_select_RSXS-0.1.patch
similarity index 74%
rename from packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-202-let_select_RSXS-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-202-let_select_RSXS-0.1.patch
index 40a0cc8094..e5d81c33d8 100644
--- a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-202-let_select_RSXS-0.1.patch
+++ b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-202-let_select_RSXS-0.1.patch
@@ -1,7 +1,7 @@
-diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
---- xbmc-31903/configure.in	2010-07-17 16:47:46.246501133 +0200
-+++ xbmc-31903.patch/configure.in	2010-07-17 16:47:17.801376519 +0200
-@@ -25,6 +25,8 @@
+diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in
+--- xbmc-Dharma-10.1-c8405db/configure.in	2011-02-15 13:58:10.630505451 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/configure.in	2011-02-15 13:59:48.190515901 +0100
+@@ -67,6 +67,8 @@
  goom_disabled="== GOOM disabled. =="
  xbmcprojectm_enabled="== XBMCProjectM enabled. =="
  xbmxprojectm_disabled="== XBMCProjectM disabled. =="
@@ -10,7 +10,7 @@ diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
  pulse_not_found="== Could not find libpulse. PulseAudio support disabled. =="
  pulse_disabled="== PulseAudio support manually disabled. =="
  faac_not_found="== Could not find libfaac. FAAC support disabled. =="
-@@ -169,6 +171,12 @@
+@@ -212,6 +214,12 @@
              [use_xbmcprojectm=$enableval],
              [use_xbmcprojectm=yes])
  
@@ -23,7 +23,7 @@ diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
  AC_ARG_ENABLE([ccache],
    [AS_HELP_STRING([--enable-ccache],
    [enable building with ccache feature (default is auto)])],
-@@ -742,6 +750,15 @@
+@@ -849,6 +857,15 @@
    BUILD_XBMCPROJECTM=1
  fi
  
@@ -39,7 +39,7 @@ diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
  ### External libraries checks
  # External FFmpeg
  if test "$use_external_ffmpeg" = "yes"; then
-@@ -1155,6 +1172,12 @@
+@@ -1233,6 +1250,12 @@
    final_message="$final_message\n  XBMCProjectM:\tNo"
  fi
  
@@ -52,7 +52,7 @@ diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
  if test "$use_mid" = "yes"; then
    final_message="$final_message\n  MID Support:\tYes"
    SDL_DEFINES="$SDL_DEFINES -DMID"
-@@ -1425,6 +1448,7 @@
+@@ -1498,6 +1521,7 @@
  AC_SUBST(BUILD_DVDCSS)
  AC_SUBST(BUILD_GOOM)
  AC_SUBST(BUILD_XBMCPROJECTM)
@@ -60,21 +60,21 @@ diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
  AC_SUBST(USE_EXTERNAL_FFMPEG)
  AC_SUBST(USE_EXTERNAL_LIBA52)
  AC_SUBST(USE_INTERNAL_LIBA52)
-@@ -1866,7 +1890,7 @@
+@@ -1952,7 +1976,7 @@
        --disable-skyrocket
    fi
  fi
 -], [0])
 +], [$BUILD_RSXS])
  
- XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
+ XB_CONFIG_MODULE([xbmc/lib/libapetag], [
    if test "$host_vendor" = "apple" ; then
-diff -Naur xbmc-31903/Makefile.in xbmc-31903.patch/Makefile.in
---- xbmc-31903/Makefile.in	2010-07-17 16:47:46.258501239 +0200
-+++ xbmc-31903.patch/Makefile.in	2010-07-17 16:47:17.803376676 +0200
-@@ -103,8 +103,10 @@
- 	lib/xbmc-dll-symbols \
- 	lib/jsoncpp/jsoncpp/src/lib_json
+diff -Naur xbmc-Dharma-10.1-c8405db/Makefile.in xbmc-Dharma-10.1-c8405db.patch/Makefile.in
+--- xbmc-Dharma-10.1-c8405db/Makefile.in	2011-02-15 13:58:10.631505430 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/Makefile.in	2011-02-15 13:59:48.191515880 +0100
+@@ -104,8 +104,10 @@
+ LIB_DIRS+=lib/libmicrohttpd
+ endif
  
 -SS_DIRS=\
 -	xbmc/screensavers/rsxs-0.9/xbmc
@@ -85,7 +85,7 @@ diff -Naur xbmc-31903/Makefile.in xbmc-31903.patch/Makefile.in
  
  VIS_DIRS=\
  	xbmc/visualizations/OpenGLSpectrum \
-@@ -323,8 +325,10 @@
+@@ -324,8 +326,10 @@
  endif
  screensavers: exports
  ifneq (arm, $(ARCH))
diff --git a/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-301-correct_lzo_include-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-301-correct_lzo_include-0.1.patch
new file mode 100644
index 0000000000..aa10112557
--- /dev/null
+++ b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-301-correct_lzo_include-0.1.patch
@@ -0,0 +1,28 @@
+diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in
+--- xbmc-Dharma-10.1-c8405db/configure.in	2011-02-15 14:00:23.143803217 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/configure.in	2011-02-15 14:01:15.327739326 +0100
+@@ -1263,12 +1263,6 @@
+   final_message="$final_message\n  MID Support:\tNo"
+ fi
+ 
+-if test -d "/usr/include/lzo"; then
+-  INCLUDES="$INCLUDES -I/usr/include/lzo"
+-else
+-  INCLUDES="$INCLUDES"
+-fi
+-
+ if test "x$use_ccache" != "xno"; then
+   AC_PATH_PROG(CCACHE,ccache,none)
+   if test "$ac_cv_path_CCACHE" = "none"; then
+diff -Naur xbmc-Dharma-10.1-c8405db/tools/TexturePacker/XBMCTex.cpp xbmc-Dharma-10.1-c8405db.patch/tools/TexturePacker/XBMCTex.cpp
+--- xbmc-Dharma-10.1-c8405db/tools/TexturePacker/XBMCTex.cpp	2011-02-15 13:30:04.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/tools/TexturePacker/XBMCTex.cpp	2011-02-15 14:01:15.328739305 +0100
+@@ -40,7 +40,7 @@
+ #endif
+ 
+ #ifdef _LINUX
+-#include <lzo1x.h>
++#include <lzo/lzo1x.h>
+ #else
+ #include "../../xbmc/lib/liblzo/LZO1X.H"
+ #endif
diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-302-dont_hardcode_usr_include-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-302-dont_hardcode_usr_include-0.1.patch
similarity index 54%
rename from packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-302-dont_hardcode_usr_include-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-302-dont_hardcode_usr_include-0.1.patch
index 33af095f6e..b3e19d5b91 100644
--- a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-302-dont_hardcode_usr_include-0.1.patch
+++ b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-302-dont_hardcode_usr_include-0.1.patch
@@ -1,15 +1,15 @@
-diff -Naur xbmc-28910/guilib/Makefile.in xbmc-28910.patch/guilib/Makefile.in
---- xbmc-28910/guilib/Makefile.in	2010-03-28 17:12:32.000000000 +0200
-+++ xbmc-28910.patch/guilib/Makefile.in	2010-03-28 19:13:23.816629379 +0200
+diff -Naur xbmc-Dharma-10.1-c8405db/guilib/Makefile.in xbmc-Dharma-10.1-c8405db.patch/guilib/Makefile.in
+--- xbmc-Dharma-10.1-c8405db/guilib/Makefile.in	2011-02-15 13:30:05.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/guilib/Makefile.in	2011-02-15 14:06:40.345116165 +0100
 @@ -1,4 +1,4 @@
 -INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/linux -I../xbmc/utils -I/usr/include/freetype2 -I/usr/include/SDL -I../xbmc/lib/libsquish
 +INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/linux -I../xbmc/utils -I../xbmc/lib/libsquish
  ifneq (@USE_EXTERNAL_FFMPEG@,1)
    INCLUDES+=-I../xbmc/cores/dvdplayer/Codecs/ffmpeg
  endif
-diff -Naur xbmc-28910/xbmc/FileSystem/Makefile.in xbmc-28910.patch/xbmc/FileSystem/Makefile.in
---- xbmc-28910/xbmc/FileSystem/Makefile.in	2010-03-28 17:14:55.000000000 +0200
-+++ xbmc-28910.patch/xbmc/FileSystem/Makefile.in	2010-03-28 19:13:23.834753245 +0200
+diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/FileSystem/Makefile.in xbmc-Dharma-10.1-c8405db.patch/xbmc/FileSystem/Makefile.in
+--- xbmc-Dharma-10.1-c8405db/xbmc/FileSystem/Makefile.in	2011-02-15 13:30:05.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/xbmc/FileSystem/Makefile.in	2011-02-15 14:06:40.346116145 +0100
 @@ -1,6 +1,6 @@
  ARCH=@ARCH@
  
@@ -18,9 +18,9 @@ diff -Naur xbmc-28910/xbmc/FileSystem/Makefile.in xbmc-28910.patch/xbmc/FileSyst
  INCLUDES+=-I../lib/libcdio/libcdio/include
  ifeq ($(findstring osx,$(ARCH)), osx)
  INCLUDES+=-I../../lib/libcurl-OSX/include
-diff -Naur xbmc-28910/xbmc/Makefile.in xbmc-28910.patch/xbmc/Makefile.in
---- xbmc-28910/xbmc/Makefile.in	2010-03-28 17:13:35.000000000 +0200
-+++ xbmc-28910.patch/xbmc/Makefile.in	2010-03-28 19:13:23.837752973 +0200
+diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/Makefile.in xbmc-Dharma-10.1-c8405db.patch/xbmc/Makefile.in
+--- xbmc-Dharma-10.1-c8405db/xbmc/Makefile.in	2011-02-15 13:30:06.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/xbmc/Makefile.in	2011-02-15 14:06:40.347116125 +0100
 @@ -1,4 +1,4 @@
 -INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -I/usr/include/freetype2 -Icores/dvdplayer
 +INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -Icores/dvdplayer
diff --git a/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-303-WiiRemote_crosscompiling-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-303-WiiRemote_crosscompiling-0.1.patch
new file mode 100644
index 0000000000..20a7760ebc
--- /dev/null
+++ b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-303-WiiRemote_crosscompiling-0.1.patch
@@ -0,0 +1,53 @@
+diff -Naur xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/Makefile xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/Makefile
+--- xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/Makefile	2011-02-15 13:30:04.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/Makefile	2011-02-15 14:08:13.446219906 +0100
+@@ -1,3 +1,4 @@
++CXX ?= g++
+ CFLAGS = -Wall -pipe -fPIC -funroll-loops
+ OBJ_DIR = release-$(shell $(CC) -v 2>&1|grep ^Target:|cut -d' ' -f2)
+ OBJS = wiiuse_v0.12/src/$(OBJ_DIR)/libwiiuse.so
+@@ -6,7 +7,7 @@
+ 
+ all:
+ 	@$(MAKE) -C wiiuse_$(VERSION)/src $@
+-	g++ $(CFLAGS) WiiUse_WiiRemote.cpp $(OBJS) -o $(BIN)
++	$(CXX) $(CFLAGS) -I./wiiuse_$(VERSION)/src WiiUse_WiiRemote.cpp $(OBJS) -o $(BIN)
+ wiiuse:
+ 	@$(MAKE) -C wiiuse_$(VERSION)/src
+ clean:
+diff -Naur xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile
+--- xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile	2011-02-15 13:30:04.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile	2011-02-15 14:08:13.447219886 +0100
+@@ -5,7 +5,7 @@
+ #
+ # Change this to your GCC version.
+ #
+-CC = gcc
++CC ?= gcc
+ 
+ ####################################################
+ #
+diff -Naur xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile
+--- xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile	2011-02-15 13:30:04.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile	2011-02-15 14:08:13.449219844 +0100
+@@ -5,7 +5,7 @@
+ #
+ # Change this to your GCC version.
+ #
+-CC = gcc
++CC ?= gcc
+ 
+ ####################################################
+ #
+diff -Naur xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile
+--- xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile	2011-02-15 13:30:04.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile	2011-02-15 14:08:13.450219823 +0100
+@@ -5,7 +5,7 @@
+ #
+ # Change this to your GCC version.
+ #
+-CC = gcc
++CC ?= gcc
+ 
+ ####################################################
+ #
diff --git a/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-303-fix_libdvd_xFLAGS-0.1.patch
new file mode 100644
index 0000000000..0fe021231d
--- /dev/null
+++ b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-303-fix_libdvd_xFLAGS-0.1.patch
@@ -0,0 +1,119 @@
+diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in
+--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in	2011-02-15 13:30:12.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in	2011-02-15 14:07:34.152020190 +0100
+@@ -6,5 +6,5 @@
+ Name: libdvdcss
+ Description: DVD access and decryption library.
+ Version: @VERSION@
+-Libs: -L${libdir} -ldvdcss
+-Cflags: -I{includedir} -I${includedir}/@PACKAGE@
++Libs: -ldvdcss
++Cflags: -I.
+diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh
+--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh	2011-02-15 13:30:12.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh	2011-02-15 14:07:34.153020170 +0100
+@@ -56,17 +56,17 @@
+ fi
+ 
+ if test "$echo_cflags" = "yes"; then
+-      echo -I$prefix/include $dvdread_cflags $extracflags $threadcflags
++      echo $dvdread_cflags $extracflags $threadcflags
+ fi
+ 
+ if test "$echo_minicflags" = "yes"; then
+-      echo -I$prefix/include -I$prefix/include/dvdnav $extracflags $threadcflags
++      echo $extracflags $threadcflags
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+-      echo -L$libdir -ldvdnav $dvdread_libs $threadlib
++      echo -ldvdnav $dvdread_libs $threadlib
+ fi      
+ 
+ if test "$echo_minilibs" = "yes"; then
+-      echo -L$libdir -ldvdnavmini $threadlib
++      echo -ldvdnavmini $threadlib
+ fi
+diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in
+--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in	2011-02-15 13:30:12.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in	2011-02-15 14:07:34.154020150 +0100
+@@ -76,13 +76,13 @@
+ fi
+ 
+ if test "$echo_cflags" = "yes"; then
+-      echo -I@includedir@ -I@includedir@/libdvdread @THREAD_CFLAGS@
++      echo @THREAD_CFLAGS@
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+-      echo -L@libdir@ -ldvdnav -ldvdread @THREAD_LIBS@
++      echo -ldvdnav -ldvdread @THREAD_LIBS@
+ fi
+ 
+ if test "$echo_minilibs" = "yes"; then
+-      echo -L@libdir@ -ldvdnavmini @THREAD_LIBS@
++      echo -ldvdnavmini @THREAD_LIBS@
+ fi      
+diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in
+--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in	2011-02-15 13:30:12.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in	2011-02-15 14:07:34.156020109 +0100
+@@ -7,5 +7,5 @@
+ Description: DVD Navigation mini library
+ Version: @VERSION@
+ 
+-Cflags: -I${includedir} @DVDREAD_CFLAGS@ @THREAD_CFLAGS@
+-Libs: -L${libdir} -ldvdnav @THREAD_LIBS@
++Cflags: @DVDREAD_CFLAGS@ @THREAD_CFLAGS@
++Libs: -ldvdnav @THREAD_LIBS@
+diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in
+--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in	2011-02-15 13:30:12.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in	2011-02-15 14:07:34.157020088 +0100
+@@ -8,5 +8,5 @@
+ Version: @VERSION@
+ 
+ Requires.private: dvdread >= 4.1.2
+-Cflags: -I${includedir} @THREAD_CFLAGS@
+-Libs: -L${libdir} -ldvdnav @THREAD_LIBS@
++Cflags: @THREAD_CFLAGS@
++Libs: -ldvdnav @THREAD_LIBS@
+diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in
+--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in	2011-02-15 13:30:12.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in	2011-02-15 14:07:34.158020067 +0100
+@@ -72,9 +72,9 @@
+ fi
+ 
+ if test "$echo_cflags" = "yes"; then
+-      echo -I@includedir@
++      echo ""
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+-      echo -L@libdir@ -ldvdread
++      echo -ldvdread
+ fi
+diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh
+--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh	2011-02-15 13:30:12.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh	2011-02-15 14:07:34.158020067 +0100
+@@ -48,9 +48,9 @@
+ fi
+ 
+ if test "$echo_cflags" = "yes"; then
+-      echo -I$prefix/include $extracflags
++      echo $extracflags
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+-      echo -L$libdir $dvdreadlib
++      echo $dvdreadlib
+ fi      
+diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in
+--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in	2011-02-15 13:30:12.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in	2011-02-15 14:07:34.159020047 +0100
+@@ -7,5 +7,5 @@
+ Description: Low level DVD access library
+ Version: @VERSION@
+ 
+-Cflags: -I${includedir}
+-Libs: -L${libdir} -ldvdread
++Cflags: -I.
++Libs: -ldvdread
diff --git a/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-321-CrystalHD_use_yuy2_to_yv12-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-321-CrystalHD_use_yuy2_to_yv12-0.1.patch
new file mode 100644
index 0000000000..72b5bd4fa8
--- /dev/null
+++ b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-321-CrystalHD_use_yuy2_to_yv12-0.1.patch
@@ -0,0 +1,12 @@
+diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp
+--- xbmc-Dharma-10.1-c8405db/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp	2011-02-15 13:30:12.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp	2011-02-15 14:08:59.000292217 +0100
+@@ -773,7 +773,7 @@
+           if (!pBuffer)
+           {
+             // No free pre-allocated buffers so make one
+-#ifdef _WIN32
++#if 1
+             // force Windows to use YV12 until DX renderer gets NV12 or YUY2 capability.
+             pBuffer = new CPictureBuffer(DVDVideoPicture::FMT_YUV420P, m_width, m_height);
+ #else
diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-401-we_dont_need_libXinerama-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-401-we_dont_need_libXinerama-0.1.patch
similarity index 61%
rename from packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-401-we_dont_need_libXinerama-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-401-we_dont_need_libXinerama-0.1.patch
index c3e6dea659..96865f6d4e 100644
--- a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-401-we_dont_need_libXinerama-0.1.patch
+++ b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-401-we_dont_need_libXinerama-0.1.patch
@@ -1,7 +1,7 @@
-diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
---- xbmc-31903/configure.in	2010-07-17 16:50:57.045376680 +0200
-+++ xbmc-31903.patch/configure.in	2010-07-17 16:52:57.912501212 +0200
-@@ -585,9 +585,6 @@
+diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in
+--- xbmc-Dharma-10.1-c8405db/configure.in	2011-02-15 14:06:18.343564347 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/configure.in	2011-02-15 14:16:56.717644949 +0100
+@@ -685,9 +685,6 @@
    PKG_CHECK_MODULES([XMU],   [xmu],
      [INCLUDES="$INCLUDES $XMU_CFLAGS"; LIBS="$LIBS $XMU_LIBS"],
      AC_MSG_ERROR($missing_library))
diff --git a/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-402-enable_yasm_in_ffmpeg-0.1.patch
new file mode 100644
index 0000000000..0aa08ea17d
--- /dev/null
+++ b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-402-enable_yasm_in_ffmpeg-0.1.patch
@@ -0,0 +1,22 @@
+diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in
+--- xbmc-Dharma-10.1-c8405db/configure.in	2011-02-15 14:17:38.576806450 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/configure.in	2011-02-15 14:22:07.235423909 +0100
+@@ -914,6 +914,10 @@
+     AC_LANG_POP([C++])
+   fi
+   CPPFLAGS="$SAVE_CPPFLAGS"
++
++  # check for yasm
++  AC_CHECK_PROG(HAVE_YASM,yasm,"yes","no",)
++
+ else
+   AC_MSG_NOTICE($external_ffmpeg_disabled)
+   USE_EXTERNAL_FFMPEG=0
+@@ -1688,6 +1692,7 @@
+       `if test "$use_arch" != "no"; then echo --arch=$use_arch; fi`\
+       `if test "$use_cpu" != "no"; then echo --cpu=$use_cpu; fi`\
+       --target-os=$(tolower $(uname -s)) \
++      `if test "$HAVE_YASM" = "yes"; then echo --enable-yasm; fi` \
+       --disable-muxers \
+       --enable-muxer=spdif \
+       --enable-muxer=adts \
diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-403-openssl_only_needed_for_internal_python-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-403-openssl_only_needed_for_internal_python-0.1.patch
similarity index 75%
rename from packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-403-openssl_only_needed_for_internal_python-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-403-openssl_only_needed_for_internal_python-0.1.patch
index f914bcde7b..832cfca576 100644
--- a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-403-openssl_only_needed_for_internal_python-0.1.patch
+++ b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-403-openssl_only_needed_for_internal_python-0.1.patch
@@ -1,7 +1,7 @@
-diff -Naur xbmc-10.0-Dharma/configure.in xbmc-10.0-Dharma.patch/configure.in
---- xbmc-10.0-Dharma/configure.in	2010-12-17 20:30:53.000000000 +0100
-+++ xbmc-10.0-Dharma.patch/configure.in	2011-01-06 03:41:05.387941174 +0100
-@@ -546,8 +546,6 @@
+diff -Naur xbmc-Dharma-10.1-c8405db/configure.in xbmc-Dharma-10.1-c8405db.patch/configure.in
+--- xbmc-Dharma-10.1-c8405db/configure.in	2011-02-15 14:23:09.427177685 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/configure.in	2011-02-15 14:23:28.731790834 +0100
+@@ -562,8 +562,6 @@
  AC_CHECK_LIB([pthread],     [main],, AC_MSG_ERROR($missing_library))
  AC_CHECK_LIB([lzo2],        [main],, AC_MSG_ERROR($missing_library))
  AC_CHECK_LIB([z],           [main],, AC_MSG_ERROR($missing_library))
@@ -10,7 +10,7 @@ diff -Naur xbmc-10.0-Dharma/configure.in xbmc-10.0-Dharma.patch/configure.in
  AC_CHECK_LIB([wavpack],     [main],, AC_MSG_ERROR($missing_library))
  AC_CHECK_LIB([mpeg2],       [main],, AC_MSG_ERROR($missing_library))
  AC_CHECK_LIB([mpeg2convert],[main],, AC_MSG_ERROR($missing_library))
-@@ -940,6 +938,8 @@
+@@ -975,6 +973,8 @@
    USE_EXTERNAL_PYTHON=1
    AC_DEFINE([USE_EXTERNAL_PYTHON], [1], [Whether to use external python library.])
  else
diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-451-full_splash-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-451-full_splash-0.1.patch
similarity index 63%
rename from packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-451-full_splash-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-451-full_splash-0.1.patch
index 0d66158268..95060d0ed4 100644
--- a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-451-full_splash-0.1.patch
+++ b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-451-full_splash-0.1.patch
@@ -1,6 +1,6 @@
-diff -Naur xbmc-28910/xbmc/utils/Splash.cpp xbmc-28910.patch/xbmc/utils/Splash.cpp
---- xbmc-28910/xbmc/utils/Splash.cpp	2010-03-28 17:14:58.000000000 +0200
-+++ xbmc-28910.patch/xbmc/utils/Splash.cpp	2010-03-28 19:29:51.138661142 +0200
+diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/utils/Splash.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/utils/Splash.cpp
+--- xbmc-Dharma-10.1-c8405db/xbmc/utils/Splash.cpp	2011-02-15 13:30:05.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/xbmc/utils/Splash.cpp	2011-02-15 14:25:02.308915505 +0100
 @@ -53,9 +53,9 @@
    g_graphicsContext.Clear();
  
diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-452-change_lcd_content-0.1.patch
similarity index 52%
rename from packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-452-change_lcd_content-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-452-change_lcd_content-0.1.patch
index d9c54b3756..66da18041b 100644
--- a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-452-change_lcd_content-0.1.patch
+++ b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-452-change_lcd_content-0.1.patch
@@ -1,12 +1,12 @@
-diff -Naur xbmc-29490/userdata/LCD.xml xbmc-29490.patch/userdata/LCD.xml
---- xbmc-29490/userdata/LCD.xml	2010-04-24 22:42:45.000000000 +0200
-+++ xbmc-29490.patch/userdata/LCD.xml	2010-04-27 17:26:02.946045110 +0200
+diff -Naur xbmc-Dharma-10.1-c8405db/userdata/LCD.xml xbmc-Dharma-10.1-c8405db.patch/userdata/LCD.xml
+--- xbmc-Dharma-10.1-c8405db/userdata/LCD.xml	2011-02-15 13:30:17.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/userdata/LCD.xml	2011-02-15 14:25:46.406031718 +0100
 @@ -21,7 +21,7 @@
        <line>Freemem: $INFO[System.FreeMemory]</line>
     </video>
     <general>
 -      <line>XBMC running...</line>
-+      <line>*** OpenELEC.tv ***</line>
++      <line>*** OpenELEC ***</line>
        <line>$INFO[System.Time] $INFO[System.Date]</line>
        <line>Freemem: $INFO[System.FreeMemory]</line>
        <line>$INFO[System.ScreenWidth]x$INFO[System.ScreenHeight] $INFO[System.ScreenMode]</line>
diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-452-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-452-ps3_remote_be_more_quiet-0.1.patch
similarity index 71%
rename from packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-452-ps3_remote_be_more_quiet-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-452-ps3_remote_be_more_quiet-0.1.patch
index 4bbd0f3b1f..f955335196 100644
--- a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-452-ps3_remote_be_more_quiet-0.1.patch
+++ b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-452-ps3_remote_be_more_quiet-0.1.patch
@@ -1,6 +1,6 @@
-diff -Naur xbmc-dharma-33971/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py xbmc-dharma-33971.patch/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py
---- xbmc-dharma-33971/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py	2010-09-19 14:54:08.000000000 +0200
-+++ xbmc-dharma-33971.patch/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py	2010-09-25 22:30:55.174281890 +0200
+diff -Naur xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py
+--- xbmc-Dharma-10.1-c8405db/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py	2011-02-15 13:30:04.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/tools/EventClients/Clients/PS3 BD Remote/ps3_remote.py	2011-02-15 14:27:22.774100190 +0100
 @@ -59,9 +59,6 @@
      target_connected = False
      target_address = None
diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-462-add_remote_irtrans_mediacenter-0.1.patch
similarity index 75%
rename from packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-462-add_remote_irtrans_mediacenter-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-462-add_remote_irtrans_mediacenter-0.1.patch
index 2b969b601e..553afd86a0 100644
--- a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-462-add_remote_irtrans_mediacenter-0.1.patch
+++ b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-462-add_remote_irtrans_mediacenter-0.1.patch
@@ -1,9 +1,9 @@
-diff -Naur xbmc-29490/system/Lircmap.xml xbmc-29490.patch/system/Lircmap.xml
---- xbmc-29490/system/Lircmap.xml	2010-04-24 22:45:26.000000000 +0200
-+++ xbmc-29490.patch/system/Lircmap.xml	2010-04-28 22:00:13.734656322 +0200
-@@ -362,4 +362,48 @@
- 		<recordedtv>recordlist</recordedtv>
- 		<title>teletext</title>
+diff -Naur xbmc-Dharma-10.1-c8405db/system/Lircmap.xml xbmc-Dharma-10.1-c8405db.patch/system/Lircmap.xml
+--- xbmc-Dharma-10.1-c8405db/system/Lircmap.xml	2011-02-15 13:30:17.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/system/Lircmap.xml	2011-02-15 14:28:14.180069773 +0100
+@@ -408,4 +408,48 @@
+ 		<yellow>KEY_YELLOW</yellow>
+ 		<blue>KEY_BLUE</blue>
  	</remote>
 +	<remote device="mediacenter">
 +		<pause>pause</pause>
diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-463-add_remote_devinput-0.1.patch
similarity index 87%
rename from packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-463-add_remote_devinput-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-463-add_remote_devinput-0.1.patch
index 8b0ef3b6b2..c88c658d86 100644
--- a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-463-add_remote_devinput-0.1.patch
+++ b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-463-add_remote_devinput-0.1.patch
@@ -1,6 +1,6 @@
-diff -Naur xbmc-dharma-35248/system/Lircmap.xml xbmc-dharma-35248.patch/system/Lircmap.xml
---- xbmc-dharma-35248/system/Lircmap.xml	2010-11-12 13:25:11.464538074 +0100
-+++ xbmc-dharma-35248.patch/system/Lircmap.xml	2010-11-12 13:26:26.486568902 +0100
+diff -Naur xbmc-Dharma-10.1-c8405db/system/Lircmap.xml xbmc-Dharma-10.1-c8405db.patch/system/Lircmap.xml
+--- xbmc-Dharma-10.1-c8405db/system/Lircmap.xml	2011-02-15 14:28:59.646158376 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/system/Lircmap.xml	2011-02-15 14:29:58.387980799 +0100
 @@ -365,7 +365,6 @@
  
  	<remote device="linux-input-layer">
diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-901-advancedsettings_alwaysextractflags.patch b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-901-advancedsettings_alwaysextractflags.patch
similarity index 60%
rename from packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-901-advancedsettings_alwaysextractflags.patch
rename to packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-901-advancedsettings_alwaysextractflags.patch
index de16d8ec29..6d4ddfd6c2 100644
--- a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-901-advancedsettings_alwaysextractflags.patch
+++ b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-901-advancedsettings_alwaysextractflags.patch
@@ -1,7 +1,7 @@
-diff -Naur xbmc-dharma-35003/xbmc/GUISettings.cpp xbmc-dharma-35003.patch/xbmc/GUISettings.cpp
---- xbmc-dharma-35003/xbmc/GUISettings.cpp	2010-10-25 15:36:18.000000000 +0200
-+++ xbmc-dharma-35003.patch/xbmc/GUISettings.cpp	2010-10-25 23:34:14.131974258 +0200
-@@ -618,6 +618,7 @@
+diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/GUISettings.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/GUISettings.cpp
+--- xbmc-Dharma-10.1-c8405db/xbmc/GUISettings.cpp	2011-02-15 13:30:06.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/xbmc/GUISettings.cpp	2011-02-15 14:31:51.689709299 +0100
+@@ -617,6 +617,7 @@
    AddInt(vid, "myvideos.selectaction", 22079, SELECT_ACTION_PLAY_OR_RESUME, SELECT_ACTION_CHOOSE, 1, SELECT_ACTION_INFO, SPIN_CONTROL_TEXT);
    AddBool(NULL, "myvideos.treatstackasfile", 20051, true);
    AddBool(vid, "myvideos.extractflags",20433, true);
@@ -9,9 +9,9 @@ diff -Naur xbmc-dharma-35003/xbmc/GUISettings.cpp xbmc-dharma-35003.patch/xbmc/G
    AddBool(vid, "myvideos.cleanstrings", 20418, false);
    AddBool(NULL, "myvideos.extractthumb",20433, true);
  
-diff -Naur xbmc-dharma-35003/xbmc/ThumbLoader.cpp xbmc-dharma-35003.patch/xbmc/ThumbLoader.cpp
---- xbmc-dharma-35003/xbmc/ThumbLoader.cpp	2010-10-25 15:37:06.000000000 +0200
-+++ xbmc-dharma-35003.patch/xbmc/ThumbLoader.cpp	2010-10-25 23:34:04.223857821 +0200
+diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/ThumbLoader.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/ThumbLoader.cpp
+--- xbmc-Dharma-10.1-c8405db/xbmc/ThumbLoader.cpp	2011-02-15 13:30:05.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/xbmc/ThumbLoader.cpp	2011-02-15 14:31:51.690709279 +0100
 @@ -148,7 +148,7 @@
        m_item.SetThumbnailImage(m_target);
      }
diff --git a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-902-advancedsettings_videolibrary.flattenmoviesets.patch b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-902-advancedsettings_videolibrary.flattenmoviesets.patch
similarity index 54%
rename from packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-902-advancedsettings_videolibrary.flattenmoviesets.patch
rename to packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-902-advancedsettings_videolibrary.flattenmoviesets.patch
index a22d3acb65..a0351fb48b 100644
--- a/packages/mediacenter/xbmc/patches/xbmc-10.0-Dharma-902-advancedsettings_videolibrary.flattenmoviesets.patch
+++ b/packages/mediacenter/xbmc/patches/xbmc-Dharma-10.1-c8405db-902-advancedsettings_videolibrary.flattenmoviesets.patch
@@ -1,7 +1,7 @@
-diff -Naur xbmc-dharma-35003/xbmc/GUISettings.cpp xbmc-dharma-35003.patch/xbmc/GUISettings.cpp
---- xbmc-dharma-35003/xbmc/GUISettings.cpp	2010-10-25 23:37:10.165043528 +0200
-+++ xbmc-dharma-35003.patch/xbmc/GUISettings.cpp	2010-10-25 23:37:27.888251923 +0200
-@@ -528,6 +528,7 @@
+diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/GUISettings.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/GUISettings.cpp
+--- xbmc-Dharma-10.1-c8405db/xbmc/GUISettings.cpp	2011-02-15 14:32:35.774825404 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/xbmc/GUISettings.cpp	2011-02-15 14:33:07.788183524 +0100
+@@ -527,6 +527,7 @@
    AddBool(NULL, "videolibrary.seasonthumbs", 20382, true);
    AddBool(vdl, "videolibrary.actorthumbs", 20402, true);
    AddInt(vdl, "videolibrary.flattentvshows", 20412, 1, 0, 1, 2, SPIN_CONTROL_TEXT);
@@ -9,9 +9,9 @@ diff -Naur xbmc-dharma-35003/xbmc/GUISettings.cpp xbmc-dharma-35003.patch/xbmc/G
    AddBool(vdl, "videolibrary.updateonstartup", 22000, false);
    AddBool(vdl, "videolibrary.backgroundupdate", 22001, false);
    AddSeparator(vdl, "videolibrary.sep3");
-diff -Naur xbmc-dharma-35003/xbmc/VideoDatabase.cpp xbmc-dharma-35003.patch/xbmc/VideoDatabase.cpp
---- xbmc-dharma-35003/xbmc/VideoDatabase.cpp	2010-10-25 15:36:19.000000000 +0200
-+++ xbmc-dharma-35003.patch/xbmc/VideoDatabase.cpp	2010-10-25 23:37:27.887251911 +0200
+diff -Naur xbmc-Dharma-10.1-c8405db/xbmc/VideoDatabase.cpp xbmc-Dharma-10.1-c8405db.patch/xbmc/VideoDatabase.cpp
+--- xbmc-Dharma-10.1-c8405db/xbmc/VideoDatabase.cpp	2011-02-15 13:30:05.000000000 +0100
++++ xbmc-Dharma-10.1-c8405db.patch/xbmc/VideoDatabase.cpp	2011-02-15 14:33:07.792183444 +0100
 @@ -4394,7 +4394,7 @@
      if (NULL == m_pDS.get()) return false;
  
@@ -21,4 +21,3 @@ diff -Naur xbmc-dharma-35003/xbmc/VideoDatabase.cpp xbmc-dharma-35003.patch/xbmc
      {
        // not getting a set, so grab all sets that match this where clause first
        CStdString setsWhere;
-diff -Naur xbmc-dharma-35003/xbmc/VideoDatabase.cpp.orig xbmc-dharma-35003.patch/xbmc/VideoDatabase.cpp.orig
diff --git a/packages/mediacenter/xbmc/rules.d/98-ps3remote.rules b/packages/mediacenter/xbmc/udev.d/98-ps3remote.rules
similarity index 100%
rename from packages/mediacenter/xbmc/rules.d/98-ps3remote.rules
rename to packages/mediacenter/xbmc/udev.d/98-ps3remote.rules
diff --git a/packages/mediacenter/xbmc/rules.d/98-wiiremote.rules b/packages/mediacenter/xbmc/udev.d/98-wiiremote.rules
similarity index 100%
rename from packages/mediacenter/xbmc/rules.d/98-wiiremote.rules
rename to packages/mediacenter/xbmc/udev.d/98-wiiremote.rules
diff --git a/packages/multimedia/libva/meta b/packages/multimedia/libva/meta
index 2bd16a0e64..8b1000bca5 100644
--- a/packages/multimedia/libva/meta
+++ b/packages/multimedia/libva/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="libva"
-PKG_VERSION="20110127"
+PKG_VERSION="20110214"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/network/cifs-utils/build b/packages/network/cifs-utils/build
new file mode 100755
index 0000000000..45000a9a45
--- /dev/null
+++ b/packages/network/cifs-utils/build
@@ -0,0 +1,37 @@
+#!/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
+
+cd $PKG_BUILD
+ac_cv_func_malloc_0_nonnull=yes \
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --libexecdir=/usr/lib \
+            --localstatedir=/var \
+            --disable-cifsupcall \
+            --disable-cifscreds \
+            --with-libcap \
+
+make
diff --git a/packages/network/cifs-utils/install b/packages/network/cifs-utils/install
new file mode 100755
index 0000000000..2cfcc0c72a
--- /dev/null
+++ b/packages/network/cifs-utils/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/sbin
+  cp $PKG_BUILD/mount.cifs $INSTALL/sbin
diff --git a/packages/network/cifs-utils/meta b/packages/network/cifs-utils/meta
new file mode 100644
index 0000000000..5df114a051
--- /dev/null
+++ b/packages/network/cifs-utils/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="cifs-utils"
+PKG_VERSION="4.8.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.samba.org"
+PKG_URL="ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="libcap"
+PKG_BUILD_DEPENDS="toolchain libcap"
+PKG_PRIORITY="optional"
+PKG_SECTION="network"
+PKG_SHORTDESC="cifs-utils: a set of user-space tools to mount/umount CIFS filesystems"
+PKG_LONGDESC="The in-kernel CIFS filesystem relies on a set of user-space tools. That package of tools is called cifs-utils. Although not really part of Samba proper, these tools were originally part of the Samba package. For several reasons, shipping these tools as part of Samba was problematic and it was deemed better to split them off into their own package."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="yes"
diff --git a/packages/network/netmount/meta b/packages/network/netmount/meta
index 7882d1e90c..b03d47fae3 100644
--- a/packages/network/netmount/meta
+++ b/packages/network/netmount/meta
@@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS="samba nfs-utils sshfs-fuse connman"
+PKG_DEPENDS="cifs-utils nfs-utils sshfs-fuse connman"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="tools"
diff --git a/packages/network/samba/build b/packages/network/samba/build
index 4faab101be..6e80cd6550 100755
--- a/packages/network/samba/build
+++ b/packages/network/samba/build
@@ -79,7 +79,7 @@ sh autogen.sh
             --without-ads \
             --with-dnsupdate \
             --without-automount \
-            --with-cifsmount \
+            --without-cifsmount \
             --without-cifsumount \
             --without-cifsupcall \
             --without-pam \
diff --git a/packages/network/samba/config/samba.conf.sample b/packages/network/samba/config/samba.conf.sample
deleted file mode 100644
index 18585b0c95..0000000000
--- a/packages/network/samba/config/samba.conf.sample
+++ /dev/null
@@ -1,125 +0,0 @@
-################################################################################
-#      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
-################################################################################
-# samba.conf
-
-# This configuration file allows you to customize the samba shares
-# available from your machine
-
-[global]
-  server string = Media Centre(%i)
-  workgroup = WORKGROUP
-  netbios name = openelec
-  security = share
-  guest account = root
-  socket options = TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192
-  wins support = yes
-  syslog only = yes
-  name resolve order = lmhosts wins bcast host
-
-# Using the following configurations as a template allows you to add
-# writable shares of disks and paths under /storage
-
-[Update]
-  path = /storage/.update
-  available = yes
-  browsable = yes
-  public = yes
-  writable = yes
-  root preexec = mkdir -p /storage/.update
-
-[Videos]
-  path = /storage/videos
-  available = yes
-  browsable = yes
-  public = yes
-  writable = yes
-  root preexec = mkdir -p /storage/videos
-
-[Music]
-  path = /storage/music
-  available = yes
-  browsable = yes
-  public = yes
-  writable = yes
-  root preexec = mkdir -p /storage/music
-
-[TV Shows]
-  path = /storage/tvshows
-  available = yes
-  browsable = yes
-  public = yes
-  writable = yes
-  root preexec = mkdir -p /storage/tvshows
-
-[Downloads]
-  path = /storage/downloads
-  available = yes
-  browsable = yes
-  public = yes
-  writable = yes
-  root preexec = mkdir -p /storage/downloads
-
-[Pictures]
-  path = /storage/pictures
-  available = yes
-  browsable = yes
-  public = yes
-  writable = yes
-  root preexec = mkdir -p /storage/pictures
-
-[Emulators]
-  path = /storage/emulators/mame/roms
-  available = yes
-  browsable = yes
-  public = yes
-  writable = yes
-  root preexec = mkdir -p /storage/emulators/mame/roms
-
-[Configfiles]
-  path = /storage/.config
-  available = yes
-  browsable = yes
-  public = yes
-  writable = yes
-  root preexec = mkdir -p /storage/.config
-
-[Userdata]
-  path = /storage/.xbmc/userdata
-  available = yes
-  browsable = yes
-  public = yes
-  writable = yes
-  root preexec = mkdir -p /storage/.xbmc/userdata
-
-[Screenshots]
-  path = /storage/screenshots
-  available = yes
-  browsable = yes
-  public = yes
-  writable = yes
-  root preexec = mkdir -p /storage/screenshots
-
-[Logfiles]
-  path = /storage/logfiles
-  available = yes
-  browsable = yes
-  public = yes
-  writable = yes
-  root preexec = mkdir -p /storage/logfiles
diff --git a/packages/network/samba/install b/packages/network/samba/install
index 43445ec10f..1da578d2cc 100755
--- a/packages/network/samba/install
+++ b/packages/network/samba/install
@@ -25,12 +25,6 @@
 mkdir -p $INSTALL/usr/lib
   cp -P $PKG_BUILD/source3/bin/*.so* $INSTALL/usr/lib
 
-if [ "$NETMOUNT" = "yes" ]; then
-  mkdir -p $INSTALL/usr/bin
-    cp $PKG_BUILD/source3/bin/mount.cifs $INSTALL/usr/bin
-    cp $PKG_BUILD/source3/bin/umount.cifs $INSTALL/usr/bin
-fi
-
 if [ "$SAMBA_SERVER" = "yes" ]; then
   mkdir -p $INSTALL/usr/bin
     cp $PKG_BUILD/source3/bin/smbd $INSTALL/usr/bin
@@ -40,7 +34,7 @@ if [ "$SAMBA_SERVER" = "yes" ]; then
     cp $PKG_DIR/config/smb.conf $INSTALL/etc/samba
 
   mkdir -p $INSTALL/usr/config
-    cp $PKG_DIR/config/samba.conf.sample $INSTALL/usr/config
+    cp $PKG_DIR/config/smb.conf $INSTALL/usr/config/samba.conf.sample
 
   mkdir -p $INSTALL/etc/init.d
     cp $PKG_DIR/scripts/* $INSTALL/etc/init.d
diff --git a/packages/network/wpa_supplicant/build b/packages/network/wpa_supplicant/build
index 0679c9fe67..0606b143ca 100755
--- a/packages/network/wpa_supplicant/build
+++ b/packages/network/wpa_supplicant/build
@@ -25,6 +25,9 @@
 cd $PKG_BUILD/$1
 
 cp $ROOT/$PKG_DIR/config/makefile.config .config
+
+echo "CONFIG_TLS=gnutls" >> .config
+echo "CONFIG_GNUTLS_EXTRA=y" >> .config
 [ "$DEBUG" = "no" ] && echo "CONFIG_NO_STDOUT_DEBUG=y" >> .config
 
 make
diff --git a/packages/network/wpa_supplicant/config/makefile.config b/packages/network/wpa_supplicant/config/makefile.config
index d4030474d4..9757389238 100644
--- a/packages/network/wpa_supplicant/config/makefile.config
+++ b/packages/network/wpa_supplicant/config/makefile.config
@@ -1,5 +1,5 @@
 CONFIG_WPS=y
-CONFIG_CTRL_IFACE=y
+CONFIG_CTRL_IFACE=unix
 CONFIG_CTRL_IFACE_DBUS=y
 CONFIG_CTRL_IFACE_DBUS_NEW=y
 CONFIG_CTRL_IFACE_DBUS_INTRO=y
@@ -8,11 +8,13 @@ CONFIG_CTRL_IFACE_DBUS_INTRO=y
 //CONFIG_DRIVER_MADWIFI=y
 CONFIG_DRIVER_ATMEL=y
 CONFIG_DRIVER_WEXT=y
-CONFIG_DRIVER_NDISWRAPPER=y
+//CONFIG_DRIVER_NDISWRAPPER=y
 //CONFIG_DRIVER_PRISM54=y
 CONFIG_DRIVER_WIRED=y
 //CONFIG_DRIVER_BROADCOM=y
 //CONFIG_DRIVER_IPW=y
+CONFIG_DRIVER_RALINK=y
+CONFIG_DRIVER_NL80211=y
 //CONFIG_DRIVER_BSD=y
 //CONFIG_DRIVER_NDIS=y
 CONFIG_WIRELESS_EXTENSION=y
@@ -22,10 +24,11 @@ CONFIG_EAP_MSCHAPV2=y
 CONFIG_EAP_TLS=y
 CONFIG_EAP_PEAP=y
 CONFIG_EAP_TTLS=y
+CONFIG_EAP_FAST=y
 CONFIG_EAP_GTC=y
 CONFIG_EAP_OTP=y
-CONFIG_EAP_SIM=y
-CONFIG_EAP_AKA=y
+//CONFIG_EAP_SIM=y
+//CONFIG_EAP_AKA=y
 CONFIG_EAP_PSK=y
 CONFIG_EAP_PAX=y
 CONFIG_EAP_LEAP=y
@@ -33,7 +36,3 @@ CONFIG_EAP_LEAP=y
 CONFIG_PKCS12=y
 CONFIG_SMARTCARD=y
 CONFIG_DEBUG_FILE=y
-CONFIG_DRIVER_NL80211=y
-
-CONFIG_TLS=gnutls
-CONFIG_GNUTLS_EXTRA=y
diff --git a/packages/network/wpa_supplicant/install b/packages/network/wpa_supplicant/install
index 5f50fb5a7c..8b38a06262 100755
--- a/packages/network/wpa_supplicant/install
+++ b/packages/network/wpa_supplicant/install
@@ -31,4 +31,4 @@ mkdir -p $INSTALL/sbin
 
 mkdir -p $INSTALL/usr/share/dbus-1/system-services
   cp $PKG_BUILD/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service $INSTALL/usr/share/dbus-1/system-services
-  cp $PKG_BUILD/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service $INSTALL/usr/share/dbus-1/system-services
\ No newline at end of file
+  cp $PKG_BUILD/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service $INSTALL/usr/share/dbus-1/system-services
diff --git a/packages/network/wpa_supplicant/patches/wpa_supplicant-0.7.3-bcm_custom_event.patch b/packages/network/wpa_supplicant/patches/wpa_supplicant-0.7.3-bcm_custom_event.patch
deleted file mode 100644
index 0a94341180..0000000000
--- a/packages/network/wpa_supplicant/patches/wpa_supplicant-0.7.3-bcm_custom_event.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/src/drivers/driver.h b/src/drivers/driver.h
-index fa49da4..511f613 100644
---- a/src/drivers/driver.h
-+++ b/src/drivers/driver.h
-@@ -2046,7 +2046,15 @@ enum wpa_event_type {
- 	 * observed in frames received from the current AP if signal strength
- 	 * monitoring has been enabled with signal_monitor().
- 	 */
--	EVENT_SIGNAL_CHANGE
-+	EVENT_SIGNAL_CHANGE,
-+
-+	/**
-+	 * EVENT_BROADCOM_CUSTOM - Broadcom custom event
-+	 *
-+	 * This event is sent when failing to associate while running the
-+	 * initial scan.
-+	 */
-+	EVENT_BROADCOM_CUSTOM
- };
- 
- 
-diff --git a/src/drivers/driver_wext.c b/src/drivers/driver_wext.c
-index 2614f23..04094ee 100644
---- a/src/drivers/driver_wext.c
-+++ b/src/drivers/driver_wext.c
-@@ -299,6 +299,9 @@ wpa_driver_wext_event_wireless_custom(void *ctx, char *custom)
- 		}
- 		wpa_supplicant_event(ctx, EVENT_STKSTART, &data);
- #endif /* CONFIG_PEERKEY */
-+	} else if (os_strncmp(custom, "Conn NoNetworks", 15) == 0) {
-+		wpa_printf(MSG_DEBUG, "WEXT: Broadcom custom event");
-+		wpa_supplicant_event(ctx, EVENT_BROADCOM_CUSTOM, &data);
- 	}
- }
- 
-diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
-index 2f3a303..c2fc28a 100644
---- a/wpa_supplicant/events.c
-+++ b/wpa_supplicant/events.c
-@@ -1726,6 +1726,15 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
- 		bgscan_notify_signal_change(
- 			wpa_s, data->signal_change.above_threshold);
- 		break;
-+	case EVENT_BROADCOM_CUSTOM:
-+		wpa_printf(MSG_DEBUG, "Broadcom event in state %d",
-+			   wpa_s->wpa_state);
-+		if (wpa_s->wpa_state == WPA_SCANNING) {
-+			/* Force scanning */
-+			wpa_s->scan_req = 1;
-+			wpa_supplicant_req_scan(wpa_s, 0, 0);
-+		}
-+		break;
- 	default:
- 		wpa_printf(MSG_INFO, "Unknown event %d", event);
- 		break;
diff --git a/packages/sysutils/bash/build b/packages/sysutils/bash/build
index c9a647024d..612c843010 100755
--- a/packages/sysutils/bash/build
+++ b/packages/sysutils/bash/build
@@ -28,7 +28,11 @@ cd $PKG_BUILD
             --prefix=/usr \
             --bindir=/bin \
             --with-gnu-ld \
+            --disable-job-control \
             --without-bash-malloc \
             --without-installed-readline \
+            --disable-nls \
+            --disable-rpath \
+            --with-gnu-ld \
 
 make
diff --git a/packages/sysutils/bash/meta b/packages/sysutils/bash/meta
index b1407fa358..31213fc783 100644
--- a/packages/sysutils/bash/meta
+++ b/packages/sysutils/bash/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="bash"
-PKG_VERSION="4.1"
+PKG_VERSION="4.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/sysutils/bash/patches/bash-4.1-fixes-1.patch b/packages/sysutils/bash/patches/bash-4.1-fixes-1.patch
deleted file mode 100644
index 15f98be9bd..0000000000
--- a/packages/sysutils/bash/patches/bash-4.1-fixes-1.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-Submitted By:            Matt Burgess <matthew_at_linuxfromscratch_dot_org>
-Date:                    2010-04-14
-Initial Package Version: 4.1
-Upstream Status:         Already in upstream patch repo
-Origin:                  Upstream
-Description:             This patch contains upstream patch numbers 1 thru 5.
-
-diff -Naur bash-4.1.orig/bashline.c bash-4.1/bashline.c
---- bash-4.1.orig/bashline.c	2009-10-24 19:10:19.000000000 +0100
-+++ bash-4.1/bashline.c	2010-04-14 20:15:22.075440836 +0100
-@@ -1680,7 +1680,7 @@
-      a single match (multiple matches that end up reducing the number of
-      characters in the common prefix are bad) will ever be returned on
-      regular completion. */
--  if (glob_pattern_p (hint))
-+  if (globpat)
-     {
-       if (state == 0)
- 	{
-diff -Naur bash-4.1.orig/builtins/printf.def bash-4.1/builtins/printf.def
---- bash-4.1.orig/builtins/printf.def	2009-11-20 20:31:23.000000000 +0000
-+++ bash-4.1/builtins/printf.def	2010-04-14 20:15:22.055434803 +0100
-@@ -172,7 +172,7 @@
- #endif
- 
- #if !HAVE_VSNPRINTF
--extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4)));
-+extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0)));
- #endif
- 
- static void printf_erange __P((char *));
-diff -Naur bash-4.1.orig/builtins/read.def bash-4.1/builtins/read.def
---- bash-4.1.orig/builtins/read.def	2009-10-08 16:35:46.000000000 +0100
-+++ bash-4.1/builtins/read.def	2010-04-14 20:15:22.095436083 +0100
-@@ -615,14 +615,15 @@
-   if (unbuffered_read == 0)
-     zsyncfd (fd);
- 
--  interrupt_immediately--;
--  terminate_immediately--;
-   discard_unwind_frame ("read_builtin");
- 
-   retval = eof ? EXECUTION_FAILURE : EXECUTION_SUCCESS;
- 
- assign_vars:
- 
-+  interrupt_immediately--;
-+  terminate_immediately--;
-+
- #if defined (ARRAY_VARS)
-   /* If -a was given, take the string read, break it into a list of words,
-      an assign them to `arrayname' in turn. */
-diff -Naur bash-4.1.orig/lib/readline/complete.c bash-4.1/lib/readline/complete.c
---- bash-4.1.orig/lib/readline/complete.c	2009-11-29 23:39:30.000000000 +0000
-+++ bash-4.1/lib/readline/complete.c	2010-04-14 20:15:22.064194346 +0100
-@@ -2138,7 +2138,7 @@
- 	 All other entries except "." and ".." match. */
-       if (filename_len == 0)
- 	{
--	  if (_rl_match_hidden_files == 0 && HIDDEN_FILE (entry->d_name))
-+	  if (_rl_match_hidden_files == 0 && HIDDEN_FILE (convfn))
- 	    continue;
- 
- 	  if (convfn[0] != '.' ||
-@@ -2219,7 +2219,7 @@
- 		temp[dirlen++] = '/';
- 	    }
- 
--	  strcpy (temp + dirlen, entry->d_name);
-+	  strcpy (temp + dirlen, convfn);
- 	}
-       else
- 	temp = savestring (convfn);
-diff -Naur bash-4.1.orig/patchlevel.h bash-4.1/patchlevel.h
---- bash-4.1.orig/patchlevel.h	2009-10-01 21:39:22.000000000 +0100
-+++ bash-4.1/patchlevel.h	2010-04-14 20:15:22.099440845 +0100
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 0
-+#define PATCHLEVEL 5
- 
- #endif /* _PATCHLEVEL_H_ */
-diff -Naur bash-4.1.orig/variables.c bash-4.1/variables.c
---- bash-4.1.orig/variables.c	2009-11-03 19:13:58.000000000 +0000
-+++ bash-4.1/variables.c	2010-04-14 20:15:22.088697241 +0100
-@@ -3808,6 +3808,11 @@
- 
-   if (tempvar_p (var) && (posixly_correct || (var->attributes & att_propagate)))
-     {
-+      /* Make sure we have a hash table to store the variable in while it is
-+	 being propagated down to the global variables table.  Create one if
-+	 we have to */
-+      if ((vc_isfuncenv (shell_variables) || vc_istempenv (shell_variables)) && shell_variables->table == 0)
-+	shell_variables->table = hash_create (0);
-       /* XXX - should we set v->context here? */
-       v = bind_variable_internal (var->name, value_cell (var), shell_variables->table, 0, 0);
-       if (shell_variables == global_variables)
diff --git a/packages/sysutils/bash/patches/bash-4.2-001-fix_job_control-0.1.patch b/packages/sysutils/bash/patches/bash-4.2-001-fix_job_control-0.1.patch
new file mode 100644
index 0000000000..98d79342a0
--- /dev/null
+++ b/packages/sysutils/bash/patches/bash-4.2-001-fix_job_control-0.1.patch
@@ -0,0 +1,15 @@
+diff -Naur bash-4.2/execute_cmd.c bash-4.2.patch/execute_cmd.c
+--- bash-4.2/execute_cmd.c	2011-02-09 23:32:25.000000000 +0100
++++ bash-4.2.patch/execute_cmd.c	2011-02-16 14:30:36.517222120 +0100
+@@ -2202,7 +2202,11 @@
+   /* If the `lastpipe' option is set with shopt, and job control is not
+      enabled, execute the last element of non-async pipelines in the
+      current shell environment. */
++#if defined (JOB_CONTROL)
+   if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0)
++#else
++  if (lastpipe_opt && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0)
++#endif /* JOB_CONTROL */
+     {
+       lstdin = move_to_high_fd (0, 0, 255);
+       if (lstdin > 0)
diff --git a/packages/sysutils/busybox/install b/packages/sysutils/busybox/install
index 5a9826f24f..c63bdf7701 100755
--- a/packages/sysutils/busybox/install
+++ b/packages/sysutils/busybox/install
@@ -35,11 +35,9 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $USER_PASSWORD`"
   cp -PR $BUILD/busybox*/_install-system/* $INSTALL
     echo "chmod 4755 $INSTALL/bin/busybox" >> $FAKEROOT_SCRIPT
 
-  mkdir -p $INSTALL/bin
-    cp $PKG_DIR/scripts/lsb-release $INSTALL/bin/
-
   mkdir -p $INSTALL/usr/bin
     cp $PKG_DIR/scripts/createlog $INSTALL/usr/bin/
+    cp $PKG_DIR/scripts/lsb_release $INSTALL/usr/bin/
 
   mkdir -p $INSTALL/sbin
     cp $PKG_DIR/scripts/init $INSTALL/sbin/
diff --git a/packages/sysutils/busybox/patches/busybox-1.18.3-buildsys.patch b/packages/sysutils/busybox/patches/busybox-1.18.3-buildsys.patch
new file mode 100644
index 0000000000..330b73fbb8
--- /dev/null
+++ b/packages/sysutils/busybox/patches/busybox-1.18.3-buildsys.patch
@@ -0,0 +1,10 @@
+--- busybox-1.18.3/Config.in
++++ busybox-1.18.3-buildsys/Config.in
+@@ -126,7 +126,6 @@ config FEATURE_INSTALLER
+ config INSTALL_NO_USR
+ 	bool "Don't use /usr"
+ 	default n
+-	depends on FEATURE_INSTALLER
+ 	help
+ 	  Disable use of /usr. busybox --install and "make install"
+ 	  will install applets only to /bin and /sbin,
diff --git a/packages/sysutils/busybox/patches/busybox-1.18.3-modutils24.patch b/packages/sysutils/busybox/patches/busybox-1.18.3-modutils24.patch
new file mode 100644
index 0000000000..2b13787f38
--- /dev/null
+++ b/packages/sysutils/busybox/patches/busybox-1.18.3-modutils24.patch
@@ -0,0 +1,36 @@
+--- busybox-1.18.3/modutils/modutils-24.c
++++ busybox-1.18.3-modutils24/modutils/modutils-24.c
+@@ -2474,6 +2474,7 @@ new_process_module_arguments(struct obj_
+ 		n = 0;
+ 		p = val;
+ 		while (*p != 0) {
++			char sv_ch;
+ 			char *endp;
+ 
+ 			if (++n > max)
+@@ -2482,14 +2483,17 @@ new_process_module_arguments(struct obj_
+ 			switch (*pinfo) {
+ 			case 's':
+ 				len = strcspn(p, ",");
++				sv_ch = p[len];
+ 				p[len] = 0;
+ 				obj_string_patch(f, sym->secidx,
+ 						 loc - contents, p);
+ 				loc += tgt_sizeof_char_p;
+ 				p += len;
++				*p = sv_ch;
+ 				break;
+ 			case 'c':
+ 				len = strcspn(p, ",");
++				sv_ch = p[len];
+ 				p[len] = 0;
+ 				if (len >= charssize)
+ 					bb_error_msg_and_die("string too long for %s (max %ld)", param,
+@@ -2497,6 +2501,7 @@ new_process_module_arguments(struct obj_
+ 				strcpy((char *) loc, p);
+ 				loc += charssize;
+ 				p += len;
++				*p = sv_ch;
+ 				break;
+ 			case 'b':
+ 				*loc++ = strtoul(p, &endp, 0);
diff --git a/packages/sysutils/busybox/patches/busybox-1.18.3-wget.patch b/packages/sysutils/busybox/patches/busybox-1.18.3-wget.patch
new file mode 100644
index 0000000000..88cfc918ca
--- /dev/null
+++ b/packages/sysutils/busybox/patches/busybox-1.18.3-wget.patch
@@ -0,0 +1,128 @@
+--- busybox-1.18.3/networking/wget.c
++++ busybox-1.18.3-wget/networking/wget.c
+@@ -446,7 +446,7 @@ static FILE* prepare_ftp_session(FILE **
+ 
+ static void NOINLINE retrieve_file_data(FILE *dfp, int output_fd)
+ {
+-	char buf[512];
++	char buf[4*1024]; /* made bigger to speed up local xfers */
+ #if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT
+ # if ENABLE_FEATURE_WGET_TIMEOUT
+ 	unsigned second_cnt;
+@@ -455,7 +455,6 @@ static void NOINLINE retrieve_file_data(
+ 
+ 	polldata.fd = fileno(dfp);
+ 	polldata.events = POLLIN | POLLPRI;
+-	ndelay_on(polldata.fd);
+ #endif
+ 	progress_meter(PROGRESS_START);
+ 
+@@ -464,6 +463,10 @@ static void NOINLINE retrieve_file_data(
+ 
+ 	/* Loops only if chunked */
+ 	while (1) {
++
++#if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT
++		ndelay_on(polldata.fd);
++#endif
+ 		while (1) {
+ 			int n;
+ 			unsigned rdsz;
+@@ -493,22 +496,46 @@ static void NOINLINE retrieve_file_data(
+ 				progress_meter(PROGRESS_BUMP);
+ 			}
+ #endif
++			/* fread internally uses read loop, which in our case
++			 * is usually exited when we get EAGAIN.
++			 * In this case, libc sets error marker on the stream.
++			 * Need to clear it before next fread to avoid possible
++			 * rare false positive ferror below. Rare because usually
++			 * fread gets more than zero bytes, and we don't fall
++			 * into if (n <= 0) ...
++			 */
++			clearerr(dfp);
++			errno = 0;
+ 			n = safe_fread(buf, rdsz, dfp);
++			/* man fread:
++			 * If error occurs, or EOF is reached, the return value
++			 * is a short item count (or zero).
++			 * fread does not distinguish between EOF and error.
++			 */
+ 			if (n <= 0) {
+-				if (ferror(dfp)) {
+-					/* perror will not work: ferror doesn't set errno */
+-					bb_error_msg_and_die(bb_msg_read_error);
+-				}
+-				break;
++#if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT
++				if (errno == EAGAIN) /* poll lied, there is no data? */
++					continue; /* yes */
++#endif
++				if (ferror(dfp))
++					bb_perror_msg_and_die(bb_msg_read_error);
++				break; /* EOF, not error */
+ 			}
++
+ 			xwrite(output_fd, buf, n);
+ #if ENABLE_FEATURE_WGET_STATUSBAR
+ 			G.transferred += n;
+ 			progress_meter(PROGRESS_BUMP);
+ #endif
+-			if (G.got_clen)
++			if (G.got_clen) {
+ 				G.content_len -= n;
++				if (G.content_len == 0)
++					break;
++			}
+ 		}
++#if ENABLE_FEATURE_WGET_STATUSBAR || ENABLE_FEATURE_WGET_TIMEOUT
++		ndelay_off(polldata.fd);
++#endif
+ 
+ 		if (!G.chunked)
+ 			break;
+@@ -706,6 +733,11 @@ int wget_main(int argc UNUSED_PARAM, cha
+ 		fprintf(sfp, "Host: %s\r\nUser-Agent: %s\r\n",
+ 			target.host, user_agent);
+ 
++		/* Ask server to close the connection as soon as we are done
++		 * (IOW: we do not intend to send more requests)
++		 */
++		fprintf(sfp, "Connection: close\r\n");
++
+ #if ENABLE_FEATURE_WGET_AUTHENTICATION
+ 		if (target.user) {
+ 			fprintf(sfp, "Proxy-Authorization: Basic %s\r\n"+6,
+@@ -719,22 +751,25 @@ int wget_main(int argc UNUSED_PARAM, cha
+ 
+ 		if (G.beg_range)
+ 			fprintf(sfp, "Range: bytes=%"OFF_FMT"u-\r\n", G.beg_range);
++
+ #if ENABLE_FEATURE_WGET_LONG_OPTIONS
+ 		if (extra_headers)
+ 			fputs(extra_headers, sfp);
+ 
+ 		if (opt & WGET_OPT_POST_DATA) {
+ 			char *estr = URL_escape(post_data);
+-			fprintf(sfp, "Content-Type: application/x-www-form-urlencoded\r\n");
+-			fprintf(sfp, "Content-Length: %u\r\n" "\r\n" "%s",
+-					(int) strlen(estr), estr);
+-			/*fprintf(sfp, "Connection: Keep-Alive\r\n\r\n");*/
+-			/*fprintf(sfp, "%s\r\n", estr);*/
++			fprintf(sfp,
++				"Content-Type: application/x-www-form-urlencoded\r\n"
++				"Content-Length: %u\r\n"
++				"\r\n"
++				"%s",
++				(int) strlen(estr), estr
++			);
+ 			free(estr);
+ 		} else
+ #endif
+-		{ /* If "Connection:" is needed, document why */
+-			fprintf(sfp, /* "Connection: close\r\n" */ "\r\n");
++		{
++			fprintf(sfp, "\r\n");
+ 		}
+ 
+ 		fflush(sfp);
diff --git a/packages/sysutils/busybox/scripts/lsb-release b/packages/sysutils/busybox/scripts/lsb_release
similarity index 100%
rename from packages/sysutils/busybox/scripts/lsb-release
rename to packages/sysutils/busybox/scripts/lsb_release
diff --git a/packages/sysutils/ifuse/install b/packages/sysutils/ifuse/install
index 551d8e5b4a..7ed72d809a 100755
--- a/packages/sysutils/ifuse/install
+++ b/packages/sysutils/ifuse/install
@@ -25,5 +25,3 @@
 mkdir -p $INSTALL/usr/bin
   cp $PKG_BUILD/src/ifuse $INSTALL/usr/bin
 
-mkdir -p $INSTALL/lib/udev/rules.d
-  cp $PKG_DIR/rules.d/*.rules $INSTALL/lib/udev/rules.d
diff --git a/packages/sysutils/ifuse/rules.d/91-iphone-automount.rules b/packages/sysutils/ifuse/udev.d/91-iphone-automount.rules
similarity index 100%
rename from packages/sysutils/ifuse/rules.d/91-iphone-automount.rules
rename to packages/sysutils/ifuse/udev.d/91-iphone-automount.rules
diff --git a/packages/sysutils/remote/eventlircd/config/evmap/03_0419_0001.evmap b/packages/sysutils/remote/eventlircd/evmap/03_0419_0001.evmap
similarity index 100%
rename from packages/sysutils/remote/eventlircd/config/evmap/03_0419_0001.evmap
rename to packages/sysutils/remote/eventlircd/evmap/03_0419_0001.evmap
diff --git a/packages/sysutils/remote/eventlircd/config/evmap/03_046e_5577.evmap b/packages/sysutils/remote/eventlircd/evmap/03_046e_5577.evmap
similarity index 100%
rename from packages/sysutils/remote/eventlircd/config/evmap/03_046e_5577.evmap
rename to packages/sysutils/remote/eventlircd/evmap/03_046e_5577.evmap
diff --git a/packages/sysutils/remote/eventlircd/config/evmap/03_05a4_9881.evmap b/packages/sysutils/remote/eventlircd/evmap/03_05a4_9881.evmap
similarity index 100%
rename from packages/sysutils/remote/eventlircd/config/evmap/03_05a4_9881.evmap
rename to packages/sysutils/remote/eventlircd/evmap/03_05a4_9881.evmap
diff --git a/packages/sysutils/remote/eventlircd/config/evmap/03_05ac_8241.evmap b/packages/sysutils/remote/eventlircd/evmap/03_05ac_8241.evmap
similarity index 100%
rename from packages/sysutils/remote/eventlircd/config/evmap/03_05ac_8241.evmap
rename to packages/sysutils/remote/eventlircd/evmap/03_05ac_8241.evmap
diff --git a/packages/sysutils/remote/eventlircd/config/evmap/03_0755_2626.evmap b/packages/sysutils/remote/eventlircd/evmap/03_0755_2626.evmap
similarity index 100%
rename from packages/sysutils/remote/eventlircd/config/evmap/03_0755_2626.evmap
rename to packages/sysutils/remote/eventlircd/evmap/03_0755_2626.evmap
diff --git a/packages/sysutils/remote/eventlircd/config/evmap/03_0766_0204.evmap b/packages/sysutils/remote/eventlircd/evmap/03_0766_0204.evmap
similarity index 100%
rename from packages/sysutils/remote/eventlircd/config/evmap/03_0766_0204.evmap
rename to packages/sysutils/remote/eventlircd/evmap/03_0766_0204.evmap
diff --git a/packages/sysutils/remote/eventlircd/config/evmap/03_0bc7_0006.evmap b/packages/sysutils/remote/eventlircd/evmap/03_0bc7_0006.evmap
similarity index 100%
rename from packages/sysutils/remote/eventlircd/config/evmap/03_0bc7_0006.evmap
rename to packages/sysutils/remote/eventlircd/evmap/03_0bc7_0006.evmap
diff --git a/packages/sysutils/remote/eventlircd/config/evmap/03_147a_e02d.evmap b/packages/sysutils/remote/eventlircd/evmap/03_147a_e02d.evmap
similarity index 100%
rename from packages/sysutils/remote/eventlircd/config/evmap/03_147a_e02d.evmap
rename to packages/sysutils/remote/eventlircd/evmap/03_147a_e02d.evmap
diff --git a/packages/sysutils/remote/eventlircd/config/evmap/bdremoteng.evmap b/packages/sysutils/remote/eventlircd/evmap/bdremoteng.evmap
similarity index 100%
rename from packages/sysutils/remote/eventlircd/config/evmap/bdremoteng.evmap
rename to packages/sysutils/remote/eventlircd/evmap/bdremoteng.evmap
diff --git a/packages/sysutils/remote/eventlircd/config/evmap/default.evmap b/packages/sysutils/remote/eventlircd/evmap/default.evmap
similarity index 100%
rename from packages/sysutils/remote/eventlircd/config/evmap/default.evmap
rename to packages/sysutils/remote/eventlircd/evmap/default.evmap
diff --git a/packages/sysutils/remote/eventlircd/config/evmap/ircore.evmap b/packages/sysutils/remote/eventlircd/evmap/ircore.evmap
similarity index 100%
rename from packages/sysutils/remote/eventlircd/config/evmap/ircore.evmap
rename to packages/sysutils/remote/eventlircd/evmap/ircore.evmap
diff --git a/packages/sysutils/remote/eventlircd/config/evmap/mcekbd.evmap b/packages/sysutils/remote/eventlircd/evmap/mcekbd.evmap
similarity index 100%
rename from packages/sysutils/remote/eventlircd/config/evmap/mcekbd.evmap
rename to packages/sysutils/remote/eventlircd/evmap/mcekbd.evmap
diff --git a/packages/sysutils/remote/eventlircd/config/evmap/power.evmap b/packages/sysutils/remote/eventlircd/evmap/power.evmap
similarity index 100%
rename from packages/sysutils/remote/eventlircd/config/evmap/power.evmap
rename to packages/sysutils/remote/eventlircd/evmap/power.evmap
diff --git a/packages/sysutils/remote/eventlircd/install b/packages/sysutils/remote/eventlircd/install
index dc5218bc27..7e4837fce5 100755
--- a/packages/sysutils/remote/eventlircd/install
+++ b/packages/sysutils/remote/eventlircd/install
@@ -32,7 +32,4 @@ mkdir -p $INSTALL/lib/udev
   chmod +x $INSTALL/lib/udev/wakeup_enable
 
 mkdir -p $INSTALL/etc/eventlircd.d
-  cp $PKG_DIR/config/evmap/*.evmap $INSTALL/etc/eventlircd.d
-
-mkdir -p $INSTALL/lib/udev/rules.d
-  cp $PKG_DIR/config/rules/*.rules $INSTALL/lib/udev/rules.d
+  cp $PKG_DIR/evmap/*.evmap $INSTALL/etc/eventlircd.d
diff --git a/packages/sysutils/remote/eventlircd/config/rules/98-eventlircd.rules b/packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules
similarity index 100%
rename from packages/sysutils/remote/eventlircd/config/rules/98-eventlircd.rules
rename to packages/sysutils/remote/eventlircd/udev.d/98-eventlircd.rules
diff --git a/packages/sysutils/remote/eventlircd/config/rules/98-lircd.rules b/packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules
similarity index 100%
rename from packages/sysutils/remote/eventlircd/config/rules/98-lircd.rules
rename to packages/sysutils/remote/eventlircd/udev.d/98-lircd.rules
diff --git a/packages/sysutils/remote/eventlircd/config/rules/99-wakeup-usb.rules b/packages/sysutils/remote/eventlircd/udev.d/99-wakeup-usb.rules
similarity index 100%
rename from packages/sysutils/remote/eventlircd/config/rules/99-wakeup-usb.rules
rename to packages/sysutils/remote/eventlircd/udev.d/99-wakeup-usb.rules
diff --git a/packages/sysutils/remote/irserver/install b/packages/sysutils/remote/irserver/install
index 93951280f5..ddb727c1b6 100755
--- a/packages/sysutils/remote/irserver/install
+++ b/packages/sysutils/remote/irserver/install
@@ -31,5 +31,3 @@ mkdir -p $INSTALL/usr/share/irtrans/remotes
   cp $PKG_BUILD/remotes/irtrans.rem $INSTALL/usr/share/irtrans/remotes
   cp $PKG_BUILD/remotes/mediacenter.rem $INSTALL/usr/share/irtrans/remotes
 
-mkdir -p $INSTALL/lib/udev/rules.d
-  cp $PKG_DIR/config/*.rules $INSTALL/lib/udev/rules.d
diff --git a/packages/sysutils/remote/irserver/config/81-irtrans.rules b/packages/sysutils/remote/irserver/udev.d/81-irtrans.rules
similarity index 100%
rename from packages/sysutils/remote/irserver/config/81-irtrans.rules
rename to packages/sysutils/remote/irserver/udev.d/81-irtrans.rules
diff --git a/packages/sysutils/udev/install b/packages/sysutils/udev/install
index bb0ac0664c..f95cdbb8f9 100755
--- a/packages/sysutils/udev/install
+++ b/packages/sysutils/udev/install
@@ -82,8 +82,6 @@ mkdir -p $INSTALL/lib/udev/rules.d
   cp $PKG_BUILD/rules/rules.d/80-drivers.rules $INSTALL/lib/udev/rules.d
   cp $PKG_BUILD/rules/rules.d/95-udev-late.rules $INSTALL/lib/udev/rules.d
 
-  cp $PKG_DIR/config/*.rules $INSTALL/lib/udev/rules.d
-
 mkdir -p $INSTALL/etc/udev
   cp $PKG_BUILD/udev.conf $INSTALL/etc/udev
   ln -sf /dev/rules.d $INSTALL/etc/udev/rules.d
diff --git a/packages/sysutils/udev/config/80-clock.rules b/packages/sysutils/udev/udev.d/80-clock.rules
similarity index 100%
rename from packages/sysutils/udev/config/80-clock.rules
rename to packages/sysutils/udev/udev.d/80-clock.rules
diff --git a/packages/sysutils/util-linux/meta b/packages/sysutils/util-linux/meta
index 1116e06fd7..302a07fbdb 100644
--- a/packages/sysutils/util-linux/meta
+++ b/packages/sysutils/util-linux/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="util-linux"
-PKG_VERSION="2.19-rc3"
+PKG_VERSION="2.19"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/sysutils/v4l-utils/meta b/packages/sysutils/v4l-utils/meta
index 0e05a0c85e..e2d7dd51b8 100644
--- a/packages/sysutils/v4l-utils/meta
+++ b/packages/sysutils/v4l-utils/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="v4l-utils"
-PKG_VERSION="0.8.2"
+PKG_VERSION="0.8.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://linuxtv.org/"
-PKG_URL="http://linuxtv.org/downloads/v4l-utils//$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://linuxtv.org/downloads/v4l-utils/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
diff --git a/packages/tools/evtest/meta b/packages/tools/evtest/meta
index 1b314d2995..8027dec759 100644
--- a/packages/tools/evtest/meta
+++ b/packages/tools/evtest/meta
@@ -19,12 +19,12 @@
 ################################################################################
 
 PKG_NAME="evtest"
-PKG_VERSION="1.25"
+PKG_VERSION="20110214"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://cgit.freedesktop.org/~whot/evtest/"
-PKG_URL="http://cgit.freedesktop.org/~whot/evtest/snapshot/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libxml2"
 PKG_BUILD_DEPENDS="toolchain libxml2"
 PKG_PRIORITY="optional"
diff --git a/packages/web/wget/build b/packages/web/wget/build
index d2113251a8..3c89fcc50e 100755
--- a/packages/web/wget/build
+++ b/packages/web/wget/build
@@ -27,5 +27,11 @@ cd $PKG_BUILD
             --build=$HOST_NAME \
             --prefix=/usr \
             --disable-debug \
+            --disable-nls \
+            --disable-rpath \
+            --enable-ipv6 \
+            --with-libiconv-prefix="$SYSROOT_PREFIX/usr" \
+            --without-libgnutls-prefix \
+            --without-libssl-prefix \
 
 make
diff --git a/packages/web/wget/meta b/packages/web/wget/meta
index 0fb414d5f1..7df85843eb 100644
--- a/packages/web/wget/meta
+++ b/packages/web/wget/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org"
 PKG_URL="http://ftp.gnu.org/gnu/wget/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
+PKG_DEPENDS="libiconv openssl"
+PKG_BUILD_DEPENDS="toolchain libiconv openssl"
 PKG_PRIORITY="optional"
 PKG_SECTION="web"
 PKG_SHORTDESC="wget: A non-interactive network retriever"
diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf
index e5ce7316d8..ca22120675 100644
--- a/projects/ATV/linux/linux.i386.conf
+++ b/projects/ATV/linux/linux.i386.conf
@@ -948,16 +948,18 @@ CONFIG_RT2X00=m
 CONFIG_RT2800PCI_PCI=y
 # CONFIG_RT2800PCI is not set
 CONFIG_RT2500USB=m
-# CONFIG_RT73USB is not set
+CONFIG_RT73USB=m
 # CONFIG_RT2800USB is not set
 CONFIG_RT2X00_LIB_USB=m
 CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
 # CONFIG_WL1251 is not set
 # CONFIG_WL12XX is not set
-# CONFIG_ZD1211RW is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -1248,28 +1250,28 @@ CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
 CONFIG_SSB_DRIVER_PCICORE=y
 # CONFIG_MFD_SUPPORT is not set
 # CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_SUPPORT=y
 
 #
 # Multimedia core support
 #
 # CONFIG_VIDEO_DEV is not set
-CONFIG_DVB_CORE=m
-CONFIG_VIDEO_MEDIA=m
+CONFIG_DVB_CORE=y
+CONFIG_VIDEO_MEDIA=y
 
 #
 # Multimedia drivers
 #
-CONFIG_IR_CORE=m
-CONFIG_VIDEO_IR=m
-CONFIG_LIRC=m
-CONFIG_RC_MAP=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_IR_CORE=y
+CONFIG_VIDEO_IR=y
+CONFIG_LIRC=y
+CONFIG_RC_MAP=y
+CONFIG_IR_NEC_DECODER=y
+CONFIG_IR_RC5_DECODER=y
+CONFIG_IR_RC6_DECODER=y
+CONFIG_IR_JVC_DECODER=y
+CONFIG_IR_SONY_DECODER=y
+CONFIG_IR_RC5_SZ_DECODER=y
 # CONFIG_IR_LIRC_CODEC is not set
 # CONFIG_IR_ENE is not set
 # CONFIG_IR_IMON is not set
@@ -1277,24 +1279,24 @@ CONFIG_IR_MCEUSB=m
 # CONFIG_IR_NUVOTON is not set
 # CONFIG_IR_STREAMZAP is not set
 # CONFIG_MEDIA_ATTACH is not set
-CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER=y
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_SIMPLE=y
+CONFIG_MEDIA_TUNER_TDA8290=y
+CONFIG_MEDIA_TUNER_TDA827X=y
+CONFIG_MEDIA_TUNER_TDA18271=y
+CONFIG_MEDIA_TUNER_TDA9887=y
+CONFIG_MEDIA_TUNER_TEA5761=y
+CONFIG_MEDIA_TUNER_TEA5767=y
+CONFIG_MEDIA_TUNER_MT20XX=y
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2266=m
 CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC2028=y
+CONFIG_MEDIA_TUNER_XC5000=y
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MC44S803=y
 CONFIG_MEDIA_TUNER_TDA18218=m
 CONFIG_DVB_MAX_ADAPTERS=2
 # CONFIG_DVB_DYNAMIC_MINORS is not set
@@ -1378,9 +1380,7 @@ CONFIG_SMS_USB_DRV=m
 #
 # Supported Mantis Adapters
 #
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-# CONFIG_DVB_HOPPER is not set
+# CONFIG_MANTIS_CORE is not set
 
 #
 # Supported nGene Adapters
@@ -1395,7 +1395,6 @@ CONFIG_DVB_MANTIS=m
 #
 # Multistandard (satellite) frontends
 #
-CONFIG_DVB_STB0899=m
 CONFIG_DVB_STB6100=m
 
 #
@@ -1411,7 +1410,6 @@ CONFIG_DVB_STV0900=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
 
 #
 # DVB-T (terrestrial) frontends
@@ -1427,7 +1425,6 @@ CONFIG_DVB_AF9013=m
 #
 # DVB-C (cable) frontends
 #
-CONFIG_DVB_TDA10021=m
 CONFIG_DVB_TDA10023=m
 
 #
@@ -1451,8 +1448,6 @@ CONFIG_DVB_TUNER_DIB0090=m
 #
 # SEC control devices for DVB-S
 #
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_TDA665x=m
 
 #
 # Tools to develop new frontends
diff --git a/projects/ATV/options b/projects/ATV/options
index 6c297a8bb9..53837a6d83 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/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf
index 6f087f9b8f..664ec83bc3 100644
--- a/projects/Generic/linux/linux.i386.conf
+++ b/projects/Generic/linux/linux.i386.conf
@@ -890,8 +890,8 @@ CONFIG_NETDEVICES=y
 # CONFIG_VETH is not set
 # CONFIG_NET_SB1000 is not set
 # CONFIG_ARCNET is not set
-CONFIG_MII=m
-CONFIG_PHYLIB=m
+CONFIG_MII=y
+CONFIG_PHYLIB=y
 
 #
 # MII PHY device drivers
@@ -911,6 +911,7 @@ CONFIG_REALTEK_PHY=m
 # CONFIG_STE10XP is not set
 # CONFIG_LSI_ET1011C_PHY is not set
 # CONFIG_MICREL_PHY is not set
+# CONFIG_FIXED_PHY is not set
 # CONFIG_MDIO_BITBANG is not set
 CONFIG_NET_ETHERNET=y
 # CONFIG_HAPPYMEAL is not set
@@ -1092,7 +1093,8 @@ CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
 # CONFIG_WL1251 is not set
 # CONFIG_WL12XX is not set
-# CONFIG_ZD1211RW is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -1484,28 +1486,29 @@ CONFIG_SSB_DRIVER_PCICORE=y
 CONFIG_MFD_CORE=m
 CONFIG_LPC_SCH=m
 # CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_SUPPORT=y
 
 #
 # Multimedia core support
 #
 # CONFIG_VIDEO_DEV is not set
-CONFIG_DVB_CORE=m
-CONFIG_VIDEO_MEDIA=m
+CONFIG_DVB_CORE=y
+CONFIG_VIDEO_MEDIA=y
 
 #
 # Multimedia drivers
 #
-CONFIG_IR_CORE=m
-CONFIG_VIDEO_IR=m
-CONFIG_LIRC=m
-CONFIG_RC_MAP=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_IR_CORE=y
+CONFIG_VIDEO_IR=y
+CONFIG_LIRC=y
+CONFIG_RC_MAP=y
+CONFIG_IR_NEC_DECODER=y
+CONFIG_IR_RC5_DECODER=y
+CONFIG_IR_RC6_DECODER=y
+CONFIG_IR_JVC_DECODER=y
+CONFIG_IR_SONY_DECODER=y
+CONFIG_IR_RC5_SZ_DECODER=y
 # CONFIG_IR_LIRC_CODEC is not set
 CONFIG_IR_ENE=m
 CONFIG_IR_IMON=m
@@ -1513,24 +1516,24 @@ CONFIG_IR_MCEUSB=m
 CONFIG_IR_NUVOTON=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER=y
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_SIMPLE=y
+CONFIG_MEDIA_TUNER_TDA8290=y
+CONFIG_MEDIA_TUNER_TDA827X=y
+CONFIG_MEDIA_TUNER_TDA18271=y
+CONFIG_MEDIA_TUNER_TDA9887=y
+CONFIG_MEDIA_TUNER_TEA5761=y
+CONFIG_MEDIA_TUNER_TEA5767=y
+CONFIG_MEDIA_TUNER_MT20XX=y
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2266=m
 CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC2028=y
+CONFIG_MEDIA_TUNER_XC5000=y
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MC44S803=y
 CONFIG_MEDIA_TUNER_TDA18218=m
 CONFIG_DVB_MAX_ADAPTERS=8
 # CONFIG_DVB_DYNAMIC_MINORS is not set
@@ -1539,8 +1542,10 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
 #
 # Supported SAA7146 based PCI Adapters
 #
-# CONFIG_TTPCI_EEPROM is not set
-# CONFIG_DVB_BUDGET_CORE is not set
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
 
 #
 # Supported USB Adapters
@@ -1615,8 +1620,8 @@ CONFIG_SMS_SDIO_DRV=m
 #
 # Supported Mantis Adapters
 #
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
+CONFIG_MANTIS_CORE=y
+CONFIG_DVB_MANTIS=y
 # CONFIG_DVB_HOPPER is not set
 
 #
@@ -1632,29 +1637,38 @@ CONFIG_DVB_MANTIS=m
 #
 # Multistandard (satellite) frontends
 #
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
+CONFIG_DVB_STB0899=y
+CONFIG_DVB_STB6100=y
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
 
 #
 # DVB-S (satellite) frontends
 #
 CONFIG_DVB_MT312=m
 CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
 CONFIG_DVB_STV0288=m
 CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV0299=y
 CONFIG_DVB_STV6110=m
 CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TDA826X=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
+CONFIG_DVB_MB86A16=y
 
 #
 # DVB-T (terrestrial) frontends
 #
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
+CONFIG_DVB_ZL10353=y
 CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
@@ -1664,8 +1678,10 @@ CONFIG_DVB_AF9013=m
 #
 # DVB-C (cable) frontends
 #
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=y
+CONFIG_DVB_TDA10023=y
+CONFIG_DVB_STV0297=m
 
 #
 # ATSC (North American/Korean Terrestrial/Cable DTV) frontends
@@ -1681,15 +1697,16 @@ CONFIG_DVB_DIB8000=m
 #
 # Digital terrestrial only tuners/PLL
 #
-CONFIG_DVB_PLL=m
+CONFIG_DVB_PLL=y
 CONFIG_DVB_TUNER_DIB0070=m
 CONFIG_DVB_TUNER_DIB0090=m
 
 #
 # SEC control devices for DVB-S
 #
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_TDA665x=m
+CONFIG_DVB_LNBP21=y
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_TDA665x=y
 
 #
 # Tools to develop new frontends
diff --git a/projects/Generic/options b/projects/Generic/options
index ce418fd48c..f5b5581f11 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/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf
index 31dcfbce1a..29e541b853 100644
--- a/projects/ION/linux/linux.i386.conf
+++ b/projects/ION/linux/linux.i386.conf
@@ -886,7 +886,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_VETH is not set
 # CONFIG_NET_SB1000 is not set
 # CONFIG_ARCNET is not set
-CONFIG_MII=m
+CONFIG_MII=y
 # CONFIG_PHYLIB is not set
 CONFIG_NET_ETHERNET=y
 # CONFIG_HAPPYMEAL is not set
@@ -999,16 +999,18 @@ CONFIG_RT2X00=m
 CONFIG_RT2800PCI_PCI=y
 # CONFIG_RT2800PCI is not set
 CONFIG_RT2500USB=m
-# CONFIG_RT73USB is not set
+CONFIG_RT73USB=m
 # CONFIG_RT2800USB is not set
 CONFIG_RT2X00_LIB_USB=m
 CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
 # CONFIG_WL1251 is not set
 # CONFIG_WL12XX is not set
-# CONFIG_ZD1211RW is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -1388,28 +1390,29 @@ CONFIG_SSB_POSSIBLE=y
 CONFIG_MFD_CORE=m
 CONFIG_LPC_SCH=m
 # CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_SUPPORT=y
 
 #
 # Multimedia core support
 #
 # CONFIG_VIDEO_DEV is not set
-CONFIG_DVB_CORE=m
-CONFIG_VIDEO_MEDIA=m
+CONFIG_DVB_CORE=y
+CONFIG_VIDEO_MEDIA=y
 
 #
 # Multimedia drivers
 #
-CONFIG_IR_CORE=m
-CONFIG_VIDEO_IR=m
-CONFIG_LIRC=m
-CONFIG_RC_MAP=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_IR_CORE=y
+CONFIG_VIDEO_IR=y
+CONFIG_LIRC=y
+CONFIG_RC_MAP=y
+CONFIG_IR_NEC_DECODER=y
+CONFIG_IR_RC5_DECODER=y
+CONFIG_IR_RC6_DECODER=y
+CONFIG_IR_JVC_DECODER=y
+CONFIG_IR_SONY_DECODER=y
+CONFIG_IR_RC5_SZ_DECODER=y
 # CONFIG_IR_LIRC_CODEC is not set
 CONFIG_IR_ENE=m
 CONFIG_IR_IMON=m
@@ -1417,24 +1420,24 @@ CONFIG_IR_MCEUSB=m
 CONFIG_IR_NUVOTON=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER=y
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_SIMPLE=y
+CONFIG_MEDIA_TUNER_TDA8290=y
+CONFIG_MEDIA_TUNER_TDA827X=y
+CONFIG_MEDIA_TUNER_TDA18271=y
+CONFIG_MEDIA_TUNER_TDA9887=y
+CONFIG_MEDIA_TUNER_TEA5761=y
+CONFIG_MEDIA_TUNER_TEA5767=y
+CONFIG_MEDIA_TUNER_MT20XX=y
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2266=m
 CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC2028=y
+CONFIG_MEDIA_TUNER_XC5000=y
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MC44S803=y
 CONFIG_MEDIA_TUNER_TDA18218=m
 CONFIG_DVB_MAX_ADAPTERS=8
 # CONFIG_DVB_DYNAMIC_MINORS is not set
@@ -1443,8 +1446,10 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
 #
 # Supported SAA7146 based PCI Adapters
 #
-# CONFIG_TTPCI_EEPROM is not set
-# CONFIG_DVB_BUDGET_CORE is not set
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
 
 #
 # Supported USB Adapters
@@ -1519,8 +1524,8 @@ CONFIG_SMS_SDIO_DRV=m
 #
 # Supported Mantis Adapters
 #
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
+CONFIG_MANTIS_CORE=y
+CONFIG_DVB_MANTIS=y
 # CONFIG_DVB_HOPPER is not set
 
 #
@@ -1536,29 +1541,38 @@ CONFIG_DVB_MANTIS=m
 #
 # Multistandard (satellite) frontends
 #
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
+CONFIG_DVB_STB0899=y
+CONFIG_DVB_STB6100=y
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
 
 #
 # DVB-S (satellite) frontends
 #
 CONFIG_DVB_MT312=m
 CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
 CONFIG_DVB_STV0288=m
 CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV0299=y
 CONFIG_DVB_STV6110=m
 CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TDA826X=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
+CONFIG_DVB_MB86A16=y
 
 #
 # DVB-T (terrestrial) frontends
 #
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
+CONFIG_DVB_ZL10353=y
 CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
@@ -1568,8 +1582,10 @@ CONFIG_DVB_AF9013=m
 #
 # DVB-C (cable) frontends
 #
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=y
+CONFIG_DVB_TDA10023=y
+CONFIG_DVB_STV0297=m
 
 #
 # ATSC (North American/Korean Terrestrial/Cable DTV) frontends
@@ -1585,15 +1601,16 @@ CONFIG_DVB_DIB8000=m
 #
 # Digital terrestrial only tuners/PLL
 #
-CONFIG_DVB_PLL=m
+CONFIG_DVB_PLL=y
 CONFIG_DVB_TUNER_DIB0070=m
 CONFIG_DVB_TUNER_DIB0090=m
 
 #
 # SEC control devices for DVB-S
 #
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_TDA665x=m
+CONFIG_DVB_LNBP21=y
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_TDA665x=y
 
 #
 # Tools to develop new frontends
diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf
index f590f28006..c821ab5dbf 100644
--- a/projects/ION/linux/linux.x86_64.conf
+++ b/projects/ION/linux/linux.x86_64.conf
@@ -835,7 +835,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_VETH is not set
 # CONFIG_NET_SB1000 is not set
 # CONFIG_ARCNET is not set
-CONFIG_MII=m
+CONFIG_MII=y
 # CONFIG_PHYLIB is not set
 CONFIG_NET_ETHERNET=y
 # CONFIG_HAPPYMEAL is not set
@@ -948,16 +948,18 @@ CONFIG_RT2X00=m
 CONFIG_RT2800PCI_PCI=y
 # CONFIG_RT2800PCI is not set
 CONFIG_RT2500USB=m
-# CONFIG_RT73USB is not set
+CONFIG_RT73USB=m
 # CONFIG_RT2800USB is not set
 CONFIG_RT2X00_LIB_USB=m
 CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 CONFIG_RT2X00_LIB_LEDS=y
 # CONFIG_RT2X00_DEBUG is not set
 # CONFIG_WL1251 is not set
 # CONFIG_WL12XX is not set
-# CONFIG_ZD1211RW is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -1330,28 +1332,29 @@ CONFIG_SSB_POSSIBLE=y
 CONFIG_MFD_CORE=m
 CONFIG_LPC_SCH=m
 # CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_SUPPORT=y
 
 #
 # Multimedia core support
 #
 # CONFIG_VIDEO_DEV is not set
-CONFIG_DVB_CORE=m
-CONFIG_VIDEO_MEDIA=m
+CONFIG_DVB_CORE=y
+CONFIG_VIDEO_MEDIA=y
 
 #
 # Multimedia drivers
 #
-CONFIG_IR_CORE=m
-CONFIG_VIDEO_IR=m
-CONFIG_LIRC=m
-CONFIG_RC_MAP=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_IR_CORE=y
+CONFIG_VIDEO_IR=y
+CONFIG_LIRC=y
+CONFIG_RC_MAP=y
+CONFIG_IR_NEC_DECODER=y
+CONFIG_IR_RC5_DECODER=y
+CONFIG_IR_RC6_DECODER=y
+CONFIG_IR_JVC_DECODER=y
+CONFIG_IR_SONY_DECODER=y
+CONFIG_IR_RC5_SZ_DECODER=y
 # CONFIG_IR_LIRC_CODEC is not set
 CONFIG_IR_ENE=m
 CONFIG_IR_IMON=m
@@ -1359,24 +1362,24 @@ CONFIG_IR_MCEUSB=m
 CONFIG_IR_NUVOTON=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER=y
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_SIMPLE=y
+CONFIG_MEDIA_TUNER_TDA8290=y
+CONFIG_MEDIA_TUNER_TDA827X=y
+CONFIG_MEDIA_TUNER_TDA18271=y
+CONFIG_MEDIA_TUNER_TDA9887=y
+CONFIG_MEDIA_TUNER_TEA5761=y
+CONFIG_MEDIA_TUNER_TEA5767=y
+CONFIG_MEDIA_TUNER_MT20XX=y
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2266=m
 CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC2028=y
+CONFIG_MEDIA_TUNER_XC5000=y
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MC44S803=y
 CONFIG_MEDIA_TUNER_TDA18218=m
 CONFIG_DVB_MAX_ADAPTERS=8
 # CONFIG_DVB_DYNAMIC_MINORS is not set
@@ -1385,8 +1388,10 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
 #
 # Supported SAA7146 based PCI Adapters
 #
-# CONFIG_TTPCI_EEPROM is not set
-# CONFIG_DVB_BUDGET_CORE is not set
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
 
 #
 # Supported USB Adapters
@@ -1461,8 +1466,8 @@ CONFIG_SMS_SDIO_DRV=m
 #
 # Supported Mantis Adapters
 #
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
+CONFIG_MANTIS_CORE=y
+CONFIG_DVB_MANTIS=y
 # CONFIG_DVB_HOPPER is not set
 
 #
@@ -1478,29 +1483,38 @@ CONFIG_DVB_MANTIS=m
 #
 # Multistandard (satellite) frontends
 #
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
+CONFIG_DVB_STB0899=y
+CONFIG_DVB_STB6100=y
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
 
 #
 # DVB-S (satellite) frontends
 #
 CONFIG_DVB_MT312=m
 CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
 CONFIG_DVB_STV0288=m
 CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV0299=y
 CONFIG_DVB_STV6110=m
 CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TDA826X=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
+CONFIG_DVB_MB86A16=y
 
 #
 # DVB-T (terrestrial) frontends
 #
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
+CONFIG_DVB_ZL10353=y
 CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
@@ -1510,8 +1524,10 @@ CONFIG_DVB_AF9013=m
 #
 # DVB-C (cable) frontends
 #
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=y
+CONFIG_DVB_TDA10023=y
+CONFIG_DVB_STV0297=m
 
 #
 # ATSC (North American/Korean Terrestrial/Cable DTV) frontends
@@ -1527,15 +1543,16 @@ CONFIG_DVB_DIB8000=m
 #
 # Digital terrestrial only tuners/PLL
 #
-CONFIG_DVB_PLL=m
+CONFIG_DVB_PLL=y
 CONFIG_DVB_TUNER_DIB0070=m
 CONFIG_DVB_TUNER_DIB0090=m
 
 #
 # SEC control devices for DVB-S
 #
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_TDA665x=m
+CONFIG_DVB_LNBP21=y
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_TDA665x=y
 
 #
 # Tools to develop new frontends
diff --git a/projects/ION/options b/projects/ION/options
index b076345790..736c341b81 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/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf
index 87cc11ec5d..1b6d15e601 100644
--- a/projects/Intel/linux/linux.i386.conf
+++ b/projects/Intel/linux/linux.i386.conf
@@ -886,7 +886,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_VETH is not set
 # CONFIG_NET_SB1000 is not set
 # CONFIG_ARCNET is not set
-CONFIG_MII=m
+CONFIG_MII=y
 # CONFIG_PHYLIB is not set
 # CONFIG_NET_ETHERNET is not set
 CONFIG_NETDEV_1000=y
@@ -960,15 +960,17 @@ CONFIG_RT2X00=m
 CONFIG_RT2800PCI_PCI=y
 # CONFIG_RT2800PCI is not set
 CONFIG_RT2500USB=m
-# CONFIG_RT73USB is not set
+CONFIG_RT73USB=m
 # CONFIG_RT2800USB is not set
 CONFIG_RT2X00_LIB_USB=m
 CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 # CONFIG_RT2X00_DEBUG is not set
 # CONFIG_WL1251 is not set
 # CONFIG_WL12XX is not set
-# CONFIG_ZD1211RW is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -1345,28 +1347,29 @@ CONFIG_SSB_POSSIBLE=y
 CONFIG_MFD_CORE=m
 CONFIG_LPC_SCH=m
 # CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_SUPPORT=y
 
 #
 # Multimedia core support
 #
 # CONFIG_VIDEO_DEV is not set
-CONFIG_DVB_CORE=m
-CONFIG_VIDEO_MEDIA=m
+CONFIG_DVB_CORE=y
+CONFIG_VIDEO_MEDIA=y
 
 #
 # Multimedia drivers
 #
-CONFIG_IR_CORE=m
-CONFIG_VIDEO_IR=m
-CONFIG_LIRC=m
-CONFIG_RC_MAP=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_IR_CORE=y
+CONFIG_VIDEO_IR=y
+CONFIG_LIRC=y
+CONFIG_RC_MAP=y
+CONFIG_IR_NEC_DECODER=y
+CONFIG_IR_RC5_DECODER=y
+CONFIG_IR_RC6_DECODER=y
+CONFIG_IR_JVC_DECODER=y
+CONFIG_IR_SONY_DECODER=y
+CONFIG_IR_RC5_SZ_DECODER=y
 # CONFIG_IR_LIRC_CODEC is not set
 CONFIG_IR_ENE=m
 CONFIG_IR_IMON=m
@@ -1374,23 +1377,23 @@ CONFIG_IR_MCEUSB=m
 CONFIG_IR_NUVOTON=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER=y
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_SIMPLE=y
+CONFIG_MEDIA_TUNER_TDA8290=y
+CONFIG_MEDIA_TUNER_TDA827X=y
+CONFIG_MEDIA_TUNER_TDA18271=y
+CONFIG_MEDIA_TUNER_TDA9887=y
+CONFIG_MEDIA_TUNER_TEA5761=y
+CONFIG_MEDIA_TUNER_TEA5767=y
+CONFIG_MEDIA_TUNER_MT20XX=y
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2266=m
 CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC2028=y
+CONFIG_MEDIA_TUNER_XC5000=y
 CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MC44S803=y
 CONFIG_DVB_MAX_ADAPTERS=8
 # CONFIG_DVB_DYNAMIC_MINORS is not set
 CONFIG_DVB_CAPTURE_DRIVERS=y
@@ -1398,8 +1401,10 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
 #
 # Supported SAA7146 based PCI Adapters
 #
-# CONFIG_TTPCI_EEPROM is not set
-# CONFIG_DVB_BUDGET_CORE is not set
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
 
 #
 # Supported USB Adapters
@@ -1474,9 +1479,9 @@ CONFIG_SMS_SDIO_DRV=m
 #
 # Supported Mantis Adapters
 #
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
-# CONFIG_DVB_HOPPER is not set
+CONFIG_MANTIS_CORE=y
+CONFIG_DVB_MANTIS=y
+CONFIG_DVB_HOPPER=y
 
 #
 # Supported nGene Adapters
@@ -1491,29 +1496,38 @@ CONFIG_DVB_MANTIS=m
 #
 # Multistandard (satellite) frontends
 #
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
+CONFIG_DVB_STB0899=y
+CONFIG_DVB_STB6100=y
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
 
 #
 # DVB-S (satellite) frontends
 #
 CONFIG_DVB_MT312=m
 CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
 CONFIG_DVB_STV0288=m
 CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV0299=y
 CONFIG_DVB_STV6110=m
 CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TDA826X=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
+CONFIG_DVB_MB86A16=y
 
 #
 # DVB-T (terrestrial) frontends
 #
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
+CONFIG_DVB_ZL10353=y
 CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
@@ -1522,8 +1536,10 @@ CONFIG_DVB_DIB7000P=m
 #
 # DVB-C (cable) frontends
 #
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=y
+CONFIG_DVB_TDA10023=y
+CONFIG_DVB_STV0297=m
 
 #
 # ATSC (North American/Korean Terrestrial/Cable DTV) frontends
@@ -1539,15 +1555,16 @@ CONFIG_DVB_DIB8000=m
 #
 # Digital terrestrial only tuners/PLL
 #
-CONFIG_DVB_PLL=m
+CONFIG_DVB_PLL=y
 CONFIG_DVB_TUNER_DIB0070=m
 CONFIG_DVB_TUNER_DIB0090=m
 
 #
 # SEC control devices for DVB-S
 #
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_TDA665x=m
+CONFIG_DVB_LNBP21=y
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_TDA665x=y
 
 #
 # Tools to develop new frontends
diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf
index bb10e0be3c..f6133a337f 100644
--- a/projects/Intel/linux/linux.x86_64.conf
+++ b/projects/Intel/linux/linux.x86_64.conf
@@ -836,7 +836,7 @@ CONFIG_NETDEVICES=y
 # CONFIG_VETH is not set
 # CONFIG_NET_SB1000 is not set
 # CONFIG_ARCNET is not set
-CONFIG_MII=m
+CONFIG_MII=y
 # CONFIG_PHYLIB is not set
 # CONFIG_NET_ETHERNET is not set
 CONFIG_NETDEV_1000=y
@@ -910,15 +910,17 @@ CONFIG_RT2X00=m
 CONFIG_RT2800PCI_PCI=y
 # CONFIG_RT2800PCI is not set
 CONFIG_RT2500USB=m
-# CONFIG_RT73USB is not set
+CONFIG_RT73USB=m
 # CONFIG_RT2800USB is not set
 CONFIG_RT2X00_LIB_USB=m
 CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y
 # CONFIG_RT2X00_DEBUG is not set
 # CONFIG_WL1251 is not set
 # CONFIG_WL12XX is not set
-# CONFIG_ZD1211RW is not set
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
 
 #
 # Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -1289,28 +1291,29 @@ CONFIG_SSB_POSSIBLE=y
 CONFIG_MFD_CORE=m
 CONFIG_LPC_SCH=m
 # CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=m
+CONFIG_MEDIA_SUPPORT=y
 
 #
 # Multimedia core support
 #
 # CONFIG_VIDEO_DEV is not set
-CONFIG_DVB_CORE=m
-CONFIG_VIDEO_MEDIA=m
+CONFIG_DVB_CORE=y
+CONFIG_VIDEO_MEDIA=y
 
 #
 # Multimedia drivers
 #
-CONFIG_IR_CORE=m
-CONFIG_VIDEO_IR=m
-CONFIG_LIRC=m
-CONFIG_RC_MAP=m
-CONFIG_IR_NEC_DECODER=m
-CONFIG_IR_RC5_DECODER=m
-CONFIG_IR_RC6_DECODER=m
-CONFIG_IR_JVC_DECODER=m
-CONFIG_IR_SONY_DECODER=m
-CONFIG_IR_RC5_SZ_DECODER=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_IR_CORE=y
+CONFIG_VIDEO_IR=y
+CONFIG_LIRC=y
+CONFIG_RC_MAP=y
+CONFIG_IR_NEC_DECODER=y
+CONFIG_IR_RC5_DECODER=y
+CONFIG_IR_RC6_DECODER=y
+CONFIG_IR_JVC_DECODER=y
+CONFIG_IR_SONY_DECODER=y
+CONFIG_IR_RC5_SZ_DECODER=y
 # CONFIG_IR_LIRC_CODEC is not set
 CONFIG_IR_ENE=m
 CONFIG_IR_IMON=m
@@ -1318,24 +1321,24 @@ CONFIG_IR_MCEUSB=m
 CONFIG_IR_NUVOTON=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=m
+CONFIG_MEDIA_TUNER=y
 # CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_SIMPLE=y
+CONFIG_MEDIA_TUNER_TDA8290=y
+CONFIG_MEDIA_TUNER_TDA827X=y
+CONFIG_MEDIA_TUNER_TDA18271=y
+CONFIG_MEDIA_TUNER_TDA9887=y
+CONFIG_MEDIA_TUNER_TEA5761=y
+CONFIG_MEDIA_TUNER_TEA5767=y
+CONFIG_MEDIA_TUNER_MT20XX=y
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2266=m
 CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC2028=y
+CONFIG_MEDIA_TUNER_XC5000=y
 CONFIG_MEDIA_TUNER_MXL5005S=m
 CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MC44S803=y
 CONFIG_MEDIA_TUNER_TDA18218=m
 CONFIG_DVB_MAX_ADAPTERS=8
 # CONFIG_DVB_DYNAMIC_MINORS is not set
@@ -1344,8 +1347,10 @@ CONFIG_DVB_CAPTURE_DRIVERS=y
 #
 # Supported SAA7146 based PCI Adapters
 #
-# CONFIG_TTPCI_EEPROM is not set
-# CONFIG_DVB_BUDGET_CORE is not set
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
 
 #
 # Supported USB Adapters
@@ -1420,8 +1425,8 @@ CONFIG_SMS_SDIO_DRV=m
 #
 # Supported Mantis Adapters
 #
-CONFIG_MANTIS_CORE=m
-CONFIG_DVB_MANTIS=m
+CONFIG_MANTIS_CORE=y
+CONFIG_DVB_MANTIS=y
 # CONFIG_DVB_HOPPER is not set
 
 #
@@ -1437,29 +1442,38 @@ CONFIG_DVB_MANTIS=m
 #
 # Multistandard (satellite) frontends
 #
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
+CONFIG_DVB_STB0899=y
+CONFIG_DVB_STB6100=y
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV6110x=m
 
 #
 # DVB-S (satellite) frontends
 #
 CONFIG_DVB_MT312=m
 CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
 CONFIG_DVB_STV0288=m
 CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV0299=y
 CONFIG_DVB_STV6110=m
 CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TDA826X=m
 CONFIG_DVB_CX24116=m
 CONFIG_DVB_SI21XX=m
 CONFIG_DVB_DS3000=m
-CONFIG_DVB_MB86A16=m
+CONFIG_DVB_MB86A16=y
 
 #
 # DVB-T (terrestrial) frontends
 #
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
 CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
+CONFIG_DVB_ZL10353=y
 CONFIG_DVB_DIB3000MB=m
 CONFIG_DVB_DIB3000MC=m
 CONFIG_DVB_DIB7000M=m
@@ -1469,8 +1483,10 @@ CONFIG_DVB_AF9013=m
 #
 # DVB-C (cable) frontends
 #
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=y
+CONFIG_DVB_TDA10023=y
+CONFIG_DVB_STV0297=m
 
 #
 # ATSC (North American/Korean Terrestrial/Cable DTV) frontends
@@ -1486,15 +1502,16 @@ CONFIG_DVB_DIB8000=m
 #
 # Digital terrestrial only tuners/PLL
 #
-CONFIG_DVB_PLL=m
+CONFIG_DVB_PLL=y
 CONFIG_DVB_TUNER_DIB0070=m
 CONFIG_DVB_TUNER_DIB0090=m
 
 #
 # SEC control devices for DVB-S
 #
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_TDA665x=m
+CONFIG_DVB_LNBP21=y
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_TDA665x=y
 
 #
 # Tools to develop new frontends
diff --git a/projects/Intel/options b/projects/Intel/options
index 04f202f4f7..c4f43b1a83 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"
diff --git a/scripts/install b/scripts/install
index e22ec8e76d..cfc0abb316 100755
--- a/scripts/install
+++ b/scripts/install
@@ -53,6 +53,11 @@ if [ -d $PKG_DIR/profile.d ]; then
   cp $PKG_DIR/profile.d/*.conf $INSTALL/etc/profile.d/
 fi
 
+if [ -d $PKG_DIR/udev.d ]; then
+  mkdir -p $INSTALL/lib/udev/rules.d
+  cp $PKG_DIR/udev.d/*.rules $INSTALL/lib/udev/rules.d
+fi
+
 if [ -d $PKG_DIR/init.network ]; then
   mkdir -p $INSTALL/etc/init.d/network
   cp $PKG_DIR/init.network/* $INSTALL/etc/init.d/network/
diff --git a/tools/mkpkg/mkpkg_xbmc-dharma-10.1 b/tools/mkpkg/mkpkg_xbmc-dharma-10.1
new file mode 100755
index 0000000000..1f7a2c2241
--- /dev/null
+++ b/tools/mkpkg/mkpkg_xbmc-dharma-10.1
@@ -0,0 +1,78 @@
+#!/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
+################################################################################
+
+PKG_NAME="xbmc"
+PKG_VERSION="Dharma-10.1"
+GIT_REPO="-b $PKG_VERSION git://github.com/theuni/xbmc.git"
+DEST_DIR="$PKG_NAME-$PKG_VERSION"
+
+echo "getting sources..."
+  if [ ! -d $DEST_DIR-latest ]; then
+    git clone $GIT_REPO $DEST_DIR-latest
+  fi
+
+  cd $DEST_DIR-latest
+    git checkout $PKG_VERSION
+    git pull
+
+echo "getting version..."
+  GIT_REV=`git log -n1 --format=%h`
+  echo $GIT_REV
+  cd ..
+
+echo "copying sources..."
+  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV
+  cp -R $DEST_DIR-latest $PKG_NAME-$PKG_VERSION-$GIT_REV
+  echo "$GIT_REV" > $PKG_NAME-$PKG_VERSION-$GIT_REV/git.version
+
+echo "cleaning sources..."
+  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/.git
+
+echo "seperating theme..."
+  rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV
+  mv $PKG_NAME-$PKG_VERSION-$GIT_REV/addons/skin.confluence $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV
+
+echo "cleaning sources..."
+  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/visualisations
+  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/lib/libSDL-*
+  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/lib/libcurl-*
+  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/project
+
+  for i in "Changelog" "Fake\ Episode\ Maker" "MingwBuildEnvironment" \
+           "PackageMaker" "Translator" "XBMCLive" "XprPack" \
+           "HardwareConfigure" "Mach5" "osx" "UpdateThumbs.py" "XBMCTex"; do
+    rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/tools/$i
+  done
+
+  for i in dll a lib so bat; do
+    find $PKG_NAME-$PKG_VERSION-$GIT_REV -name *.$i -exec rm -rf {} ";"
+  done
+
+  # bundled win32 binaries
+  rm -r $PKG_NAME-$PKG_VERSION-$GIT_REV/xbmc/visualizations/XBMCProjectM/win32
+
+echo "packing sources..."
+  tar cvjf $PKG_NAME-$PKG_VERSION-$GIT_REV.tar.bz2 $PKG_NAME-$PKG_VERSION-$GIT_REV
+  tar cvjf $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV.tar.bz2 $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV
+
+echo "remove temporary sourcedir..."
+  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV
+  rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV