diff --git a/packages/mediacenter/xbmc/patches/014_xbmc-xrandr_gcc4.4-0.1.diff b/packages/mediacenter/xbmc/014_xbmc-xrandr_gcc4.4-0.1.diff
similarity index 100%
rename from packages/mediacenter/xbmc/patches/014_xbmc-xrandr_gcc4.4-0.1.diff
rename to packages/mediacenter/xbmc/014_xbmc-xrandr_gcc4.4-0.1.diff
diff --git a/packages/mediacenter/xbmc/074-xbmc-change_configdir-0.1.diff b/packages/mediacenter/xbmc/074-xbmc-change_configdir-0.1.diff
new file mode 100644
index 0000000000..a4a6c06383
--- /dev/null
+++ b/packages/mediacenter/xbmc/074-xbmc-change_configdir-0.1.diff
@@ -0,0 +1,46 @@
+diff -Naur xbmc/xbmc/linux/NetworkLinux.cpp xbmc.patch/xbmc/linux/NetworkLinux.cpp
+--- xbmc/xbmc/linux/NetworkLinux.cpp	2009-10-21 07:57:27.000000000 +0200
++++ xbmc.patch/xbmc/linux/NetworkLinux.cpp	2009-11-05 03:20:12.898254181 +0100
+@@ -549,7 +549,7 @@
+    assignment = NETWORK_DISABLED;
+ 
+ #ifndef __APPLE__
+-   FILE* fp = fopen("/etc/network/interfaces", "r");
++   FILE* fp = fopen("/storage/.config/interfaces", "r");
+    if (!fp)
+    {
+       // TODO
+@@ -625,7 +625,7 @@
+ void CNetworkInterfaceLinux::SetSettings(NetworkAssignment& assignment, CStdString& ipAddress, CStdString& networkMask, CStdString& defaultGateway, CStdString& essId, CStdString& key, EncMode& encryptionMode)
+ {
+ #ifndef __APPLE__
+-   FILE* fr = fopen("/etc/network/interfaces", "r");
++   FILE* fr = fopen("/storage/.config/interfaces", "r");
+    if (!fr)
+    {
+       // TODO
+@@ -701,13 +701,13 @@
+    fclose(fw);
+ 
+    // Rename the file
+-   if (rename("/tmp/interfaces.temp", "/etc/network/interfaces") < 0)
++   if (rename("/tmp/interfaces.temp", "/storage/.config/interfaces") < 0)
+    {
+       // TODO
+       return;
+    }
+ 
+-   std::string cmd = "/sbin/ifdown " + GetName();
++   std::string cmd = "/sbin/ifdown -i /storage/.config/interfaces " + GetName();
+    if (system(cmd.c_str()) != 0)
+      CLog::Log(LOGERROR, "Unable to stop interface %s", GetName().c_str());
+    else
+@@ -715,7 +715,7 @@
+ 
+    if (assignment != NETWORK_DISABLED)
+    {
+-      cmd = "/sbin/ifup " + GetName();
++      cmd = "/sbin/ifup -i /storage/.config/interfaces " + GetName();
+       if (system(cmd.c_str()) != 0)
+         CLog::Log(LOGERROR, "Unable to start interface %s", GetName().c_str());
+       else
diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index d18ba20b2b..899ac119f2 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -51,13 +51,13 @@ $SCRIPTS/build flac
 
 $SCRIPTS/build SDL         #?
 $SCRIPTS/build SDL_mixer   #?
+$SCRIPTS/build SDL_image   #?
 
 $SCRIPTS/build avahi
 $SCRIPTS/build sqlite
 $SCRIPTS/build mysql #lib  #?
 $SCRIPTS/build samba #lib
 
-
 # export CMAKE_INSTALL_PREFIX=/usr
 # export CMAKE_FIND_ROOT_PATH=$SYSROOT_PREFIX
 
@@ -65,9 +65,9 @@ cd $PKG_BUILD
 autoheader
 autoconf
 
-CC_FOR_BUILD=$HOST_CC \
-CXX_FOR_BUILD=$HOST_CXX \
-LDFLAGS="$LDFLAGS -lutil" \
+# CC_FOR_BUILD=$HOST_CC \
+# CXX_FOR_BUILD=$HOST_CXX \
+# LDFLAGS="$LDFLAGS -lutil" \
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
             --prefix=/usr \
@@ -95,7 +95,7 @@ LDFLAGS="$LDFLAGS -lutil" \
             --disable-external-libdts \
             --disable-external-libmpeg2 \
             --disable-external-libass \
-            --disable-external-libogg \
+            --enable-external-libogg \
             --enable-external-python \
 
 make externals
diff --git a/packages/mediacenter/xbmc/init.d/67_xbmc b/packages/mediacenter/xbmc/init.d/67_xbmc
new file mode 100755
index 0000000000..6109861426
--- /dev/null
+++ b/packages/mediacenter/xbmc/init.d/67_xbmc
@@ -0,0 +1,87 @@
+#!/bin/sh
+#
+# configure X.Org video settings
+#
+# runlevels: openelec
+
+. /etc/sysconfig
+
+progress "starting Mediacenter"
+
+. /etc/sysconfig
+
+export XBMC_HOME="/usr/share/xbmc"
+args="--standalone -fs --lircdev $LIRC_OUTPUT"
+
+print_crash_report()
+{
+  FILE="/storage/OpenELEC_crashlog-`date +%Y%m%d_%H%M%S`.log"
+  CORE=`ls -d core* | head -n1`
+  echo "############## XBMC CRASH LOG ###############" >> $FILE
+  echo >> $FILE
+  echo "################ SYSTEM INFO ################" >> $FILE
+  echo -n " Date: " >> $FILE
+  date >> $FILE
+  echo " XBMC Options: $*" >> $FILE
+  echo -n " Arch: " >> $FILE
+  uname -m >> $FILE
+  echo -n " Kernel: " >> $FILE
+  uname -rvs >> $FILE
+  echo -n " Release: " >> $FILE
+  cat /etc/openelec-release >> $FILE
+  echo "############## END SYSTEM INFO ##############" >> $FILE
+  echo >> $FILE
+  echo "############### STACK TRACE #################" >> $FILE
+  gdb /usr/share/xbmc/xbmc.bin --core=$CORE --batch -ex "thread apply all bt" 2> /dev/null >> $FILE
+  rm -f $CORE
+  echo "############# END STACK TRACE ###############" >> $FILE
+  echo >> $FILE
+  echo "################# LOG FILE ##################" >> $FILE
+  echo >> $FILE
+  if [ -f ~/.xbmc/temp/xbmc.log ]; then
+    cat ~/.xbmc/temp/xbmc.log >> $FILE
+    echo >> $FILE
+  else
+    echo "Logfile not found in the usual place." >> $FILE
+    echo "Please attach it seperately." >> $FILE
+    echo "Use pastebin.com or similar for forums or IRC." >> $FILE
+  fi
+  echo >> $FILE
+  echo "############### END LOG FILE ################" >> $FILE
+  echo >> $FILE
+  echo "############ END XBMC CRASH LOG #############" >> $FILE
+  echo "Crash report available at $FILE"
+}
+
+ulimit -c unlimited
+killall xsplash
+
+while true; do
+  if [ -f /tmp/.X0-lock ]; then
+    DISPLAY=:0.0 /usr/bin/xbmc ${args} > /dev/null 2>&1
+    RET=$?
+    echo "Exited with code $RET"
+
+    if [ "$RET" == 0 ]; then
+      break
+
+    elif [ "$RET" == 64 ]; then
+      sync
+      poweroff
+
+    elif [ "$RET" == 65 ]; then
+      LOOP=1
+
+    elif [ "$RET" == 66 ]; then
+      sync
+      reboot
+
+    elif [ "$RET" >= 131 ] && [ "$RET" <= 136 ]; then
+      print_crash_report
+
+    elif [ "$RET" == 139 ]; then
+      print_crash_report
+
+    fi
+  fi
+done
diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install
index 9b12fba5e5..9de666bc65 100755
--- a/packages/mediacenter/xbmc/install
+++ b/packages/mediacenter/xbmc/install
@@ -49,6 +49,7 @@ $SCRIPTS/install flac
 
 $SCRIPTS/install SDL
 $SCRIPTS/install SDL_mixer
+$SCRIPTS/install SDL_image
 
 $SCRIPTS/install avahi
 $SCRIPTS/install sqlite
diff --git a/packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.1.diff b/packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.1.diff
index d50a270ce1..9b733ff2c5 100644
--- a/packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.1.diff
+++ b/packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.1.diff
@@ -1,6 +1,6 @@
-diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
---- xbmc-23998/configure.in	2009-10-25 09:58:44.000000000 +0100
-+++ xbmc-23998.patch/configure.in	2009-10-25 13:29:18.466661360 +0100
+diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in
+--- xbmc-24229/configure.in	2009-11-03 10:52:38.476400434 +0100
++++ xbmc-24229.patch/configure.in	2009-11-03 12:09:00.994396891 +0100
 @@ -69,6 +69,9 @@
      i*86*-linux-gnu*)
         ARCH="i486-linux"
@@ -11,7 +11,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
      x86_64-*-linux-gnu*)
         ARCH="x86_64-linux"
         ;;
-@@ -1062,6 +1065,8 @@
+@@ -1071,6 +1074,8 @@
  XB_CONFIG_MODULE([xbmc/lib/libPython/Python], [
    if test "$host_vendor" = "apple" ; then
      ./configure \
@@ -20,7 +20,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
        --enable-ipv6 \
        --enable-unicode=ucs4 \
        --without-cxx \
-@@ -1084,6 +1089,8 @@
+@@ -1093,6 +1098,8 @@
      cp pyconfig.h Include	
    else
      ./configure \
@@ -29,7 +29,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
        --enable-ipv6 \
        --enable-unicode=ucs4 \
        --without-cxx \
-@@ -1101,6 +1108,8 @@
+@@ -1110,6 +1117,8 @@
    if test "$host_vendor" = "apple" ; then
      CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \    
      ./configure MACOSX_DEPLOYMENT_TARGET=10.4 -C \
@@ -38,7 +38,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
        --with-pic \
        --disable-asm-optimizations \
        --disable-xmms-plugin \
-@@ -1115,7 +1124,9 @@
+@@ -1124,7 +1133,9 @@
  XB_CONFIG_MODULE([xbmc/cores/paplayer/vorbisfile/libvorbis], [
    if test "$host_vendor" = "apple" ; then
      CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
@@ -49,7 +49,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
    else
      true
    fi
-@@ -1124,7 +1135,9 @@
+@@ -1133,7 +1144,9 @@
  XB_CONFIG_MODULE([xbmc/cores/paplayer/vorbisfile/ogg], [
    if test "$host_vendor" = "apple" ; then
      CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
@@ -60,7 +60,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
    else
      true
    fi
-@@ -1137,6 +1150,7 @@
+@@ -1146,6 +1159,7 @@
        --disable-amd3dnow \
        --disable-static \
        `if test "$use_debug" = "no"; then echo --disable-debug; fi` \
@@ -68,7 +68,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
        --disable-muxers \
        --disable-encoders \
        --disable-devices \
-@@ -1148,6 +1162,7 @@
+@@ -1157,6 +1171,7 @@
        --disable-decoder=mpeg_xvmc \
        --enable-postproc \
        --enable-gpl \
@@ -76,7 +76,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
        --enable-protocol=http \
        --enable-pthreads \
        --cc="$CC" &&
-@@ -1161,6 +1176,7 @@
+@@ -1170,6 +1185,7 @@
        --disable-static \
        --disable-ipv6 \
        `if test "$use_debug" = "no"; then echo --disable-debug; fi` \
@@ -84,7 +84,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
        --disable-muxers \
        --disable-encoders \
        --disable-decoder=mpeg_xvmc \
-@@ -1172,6 +1188,7 @@
+@@ -1181,6 +1197,7 @@
        --enable-postproc \
        --enable-gpl \
        `if test "$use_vdpau" = "yes"; then echo --enable-vdpau; fi` \
@@ -92,7 +92,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
        --enable-libfaad \
        --enable-protocol=http \
        --enable-pthreads \
-@@ -1185,12 +1202,16 @@
+@@ -1194,12 +1211,16 @@
      CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
      LDFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
      ./configure \
@@ -109,7 +109,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
        --disable-oss \
        --disable-solaris-audio \
        --disable-al-audio \
-@@ -1203,11 +1224,15 @@
+@@ -1212,11 +1233,15 @@
    if test "$host_vendor" = "apple" ; then
      ./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
      CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
@@ -125,7 +125,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
        --disable-doc \
        --enable-static \
        --with-pic
-@@ -1218,6 +1243,8 @@
+@@ -1227,6 +1252,8 @@
    if test "$host_vendor" = "apple" ; then
      ./configure2 MACOSX_DEPLOYMENT_TARGET=10.4 \
        --extra-cflags="$DVDREAD_CFLAGS -D__DARWIN__ -fPIC -DPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -I`pwd`/../libdvdcss/src" \
@@ -134,7 +134,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
        --enable-static \
        --disable-shared \
        --cc="$CC" &&
-@@ -1227,6 +1254,8 @@
+@@ -1236,6 +1263,8 @@
    else
      ./configure2 \
        --extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \
@@ -143,7 +143,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
        --enable-static \
        --disable-shared \
        --cc="$CC" &&
-@@ -1242,6 +1271,8 @@
+@@ -1251,6 +1280,8 @@
      ./configure2 MACOSX_DEPLOYMENT_TARGET=10.4 \
        --extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -I`pwd`/../includes" \
        --extra-ldflags="-L`pwd`/../libdvdread/obj" \
@@ -152,7 +152,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
        --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
        --enable-static \
        --disable-shared \
-@@ -1250,6 +1281,8 @@
+@@ -1259,6 +1290,8 @@
      ./configure2 \
        --extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \
        --extra-ldflags="-L`pwd`/../libdvdread/obj" \
@@ -161,7 +161,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
        --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
        --enable-static \
        --disable-shared \
-@@ -1261,6 +1294,8 @@
+@@ -1270,6 +1303,8 @@
    if test "$host_vendor" = "apple" ; then
      CFLAGS="-O3 -fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
      ./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
@@ -170,7 +170,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
        --with-pic \
        --with-mp4v2
    else
-@@ -1272,6 +1307,8 @@
+@@ -1281,6 +1316,8 @@
    if test "$host_vendor" = "apple" ; then
      CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
      ./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
@@ -179,7 +179,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
        --with-pic \
        --disable-static \
        --enable-shared \
-@@ -1281,6 +1318,8 @@
+@@ -1290,6 +1327,8 @@
        --disable-al-audio
    else
      ./configure \
@@ -188,7 +188,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
        --with-pic \
        --disable-static \
        --enable-shared \
-@@ -1296,6 +1335,8 @@
+@@ -1305,6 +1344,8 @@
    if test "$host_vendor" = "apple" ; then
      CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
      ./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
@@ -197,7 +197,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
        --with-pic \
        --disable-static \
        --enable-shared \
-@@ -1304,6 +1345,8 @@
+@@ -1313,6 +1354,8 @@
        --without-x
    else
      ./configure \
@@ -206,7 +206,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
        --with-pic \
        --disable-static \
        --enable-shared \
-@@ -1317,6 +1360,8 @@
+@@ -1326,6 +1369,8 @@
    if test "$host_vendor" = "apple" ; then
      CFLAGS="-fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
      ./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
@@ -215,7 +215,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
        --with-pic
    else
      true
-@@ -1327,17 +1372,23 @@
+@@ -1336,17 +1381,23 @@
    if test "$host_vendor" = "apple" ; then
      export MACOSX_DEPLOYMENT_TARGET=10.4
      CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
@@ -242,7 +242,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
    fi
  ], [$USE_EXTERNAL_LIBASS])
  
-@@ -1346,12 +1397,16 @@
+@@ -1355,12 +1406,16 @@
      CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -fno-common" \
      CPPFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -fno-common" \
      ./configure MACOSX_DEPLOYMENT_TARGET=10.4 \
@@ -259,7 +259,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
        --disable-static \
        --disable-debugging \
        --with-pic
-@@ -1371,12 +1426,16 @@
+@@ -1380,12 +1435,16 @@
      ./configure \
        CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
        CXXFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4"\
@@ -276,7 +276,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
        --disable-shared \
        --enable-static \
        --with-pic
-@@ -1391,6 +1450,8 @@
+@@ -1400,6 +1459,8 @@
        CXXFLAGS="-fPIC -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
        LDFLAGS="-L/opt/local/lib" \
        LIBS="-lz" \
@@ -285,7 +285,7 @@ diff -Naur xbmc-23998/configure.in xbmc-23998.patch/configure.in
        --x-includes=/usr/X11/include --x-libraries=/usr/X11/lib \
        --without-xscreensaver \
        --disable-sound \
-@@ -1406,6 +1467,8 @@
+@@ -1415,6 +1476,8 @@
      ./configure \
        CFLAGS="-fPIC" \ 
        CXXFLAGS="-fPIC" \
diff --git a/packages/mediacenter/xbmc/patches/011_xbmc-let_select_XBMCProjectM-0.1.diff b/packages/mediacenter/xbmc/patches/011_xbmc-let_select_XBMCProjectM-0.1.diff
index 2642b466fa..cc4c2170ec 100644
--- a/packages/mediacenter/xbmc/patches/011_xbmc-let_select_XBMCProjectM-0.1.diff
+++ b/packages/mediacenter/xbmc/patches/011_xbmc-let_select_XBMCProjectM-0.1.diff
@@ -1,6 +1,6 @@
-diff -Naur xbmc-23757/configure.in xbmc-23757.patch/configure.in
---- xbmc-23757/configure.in	2009-10-16 21:49:02.827519056 +0200
-+++ xbmc-23757.patch/configure.in	2009-10-16 21:49:23.616641888 +0200
+diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in
+--- xbmc-24229/configure.in	2009-11-03 12:09:52.172520636 +0100
++++ xbmc-24229.patch/configure.in	2009-11-03 12:10:09.146521883 +0100
 @@ -43,6 +43,8 @@
  avahi_disabled="== Avahi support disabled. =="
  vdpau_not_found="== Could not find libvdpau. VDPAU support disabled. =="
@@ -23,7 +23,7 @@ diff -Naur xbmc-23757/configure.in xbmc-23757.patch/configure.in
  AC_PATH_PROG(CCACHE,ccache,none)
  AC_ARG_ENABLE([ccache],
              [AS_HELP_STRING([--enable-ccache],
-@@ -499,6 +507,15 @@
+@@ -501,6 +509,15 @@
    fi
  fi
  
@@ -39,7 +39,7 @@ diff -Naur xbmc-23757/configure.in xbmc-23757.patch/configure.in
  ### External libraries checks
  if test "$use_external_libraries" = "yes"; then
    AC_MSG_NOTICE($external_libraries_enabled)
-@@ -823,6 +840,12 @@
+@@ -827,6 +844,12 @@
    final_message="$final_message\n  GOOM:\t\tNo"
  fi
  
@@ -51,8 +51,8 @@ diff -Naur xbmc-23757/configure.in xbmc-23757.patch/configure.in
 +
  if test "$use_pcre" = "yes"; then
    final_message="$final_message\n  PCRE Support:\tYes"
-   SDL_DEFINES="$SDL_DEFINES -DHAS_PCRE"
-@@ -1010,6 +1033,7 @@
+ else
+@@ -1031,6 +1054,7 @@
  AC_SUBST(SDL_DEFINES)
  AC_SUBST(BUILD_DVDCSS)
  AC_SUBST(BUILD_GOOM)
@@ -60,7 +60,7 @@ diff -Naur xbmc-23757/configure.in xbmc-23757.patch/configure.in
  AC_SUBST(USE_EXTERNAL_LIBRARIES)
  AC_SUBST(USE_EXTERNAL_FFMPEG)
  AC_SUBST(USE_EXTERNAL_LIBA52)
-@@ -1403,7 +1427,7 @@
+@@ -1428,7 +1452,7 @@
    else
      rm -f CMakeCache.txt && CC="" CXX=""  cmake -D CMAKE_BUILD_TYPE:STRING=RelWithDebInfo -D USE_FTGL:BOOL=OFF .
    fi
@@ -69,10 +69,10 @@ diff -Naur xbmc-23757/configure.in xbmc-23757.patch/configure.in
  
  XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
    if test "$host_vendor" = "apple" ; then
-diff -Naur xbmc-23757/Makefile.in xbmc-23757.patch/Makefile.in
---- xbmc-23757/Makefile.in	2009-10-16 18:46:07.000000000 +0200
-+++ xbmc-23757.patch/Makefile.in	2009-10-16 21:49:44.335517603 +0200
-@@ -95,8 +95,10 @@
+diff -Naur xbmc-24229/Makefile.in xbmc-24229.patch/Makefile.in
+--- xbmc-24229/Makefile.in	2009-11-03 10:52:38.481395092 +0100
++++ xbmc-24229.patch/Makefile.in	2009-11-03 12:10:09.154522004 +0100
+@@ -94,8 +94,10 @@
  
  VIS_DIRS=\
  	xbmc/visualizations/OpenGLSpectrum \
@@ -85,7 +85,7 @@ diff -Naur xbmc-23757/Makefile.in xbmc-23757.patch/Makefile.in
  ifneq (@BUILD_GOOM@,1)
  VIS_DIRS+=xbmc/visualizations/Goom
  endif
-@@ -255,7 +257,9 @@
+@@ -252,7 +254,9 @@
  visualizations: exports
  	$(MAKE) -C xbmc/visualizations/OpenGLSpectrum
  	$(MAKE) -C xbmc/visualizations/WaveForm
diff --git a/packages/mediacenter/xbmc/patches/012_xbmc-let_select_RSXS-0.1.diff b/packages/mediacenter/xbmc/patches/012_xbmc-let_select_RSXS-0.1.diff
index bd26d86cf4..5c0d9c7a80 100644
--- a/packages/mediacenter/xbmc/patches/012_xbmc-let_select_RSXS-0.1.diff
+++ b/packages/mediacenter/xbmc/patches/012_xbmc-let_select_RSXS-0.1.diff
@@ -1,6 +1,6 @@
-diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
---- xbmc-23782/configure.in	2009-10-17 23:10:17.764644091 +0200
-+++ xbmc-23782.patch/configure.in	2009-10-17 23:11:34.893517566 +0200
+diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in
+--- xbmc-24229/configure.in	2009-11-03 12:10:59.770522186 +0100
++++ xbmc-24229.patch/configure.in	2009-11-03 12:11:20.955408376 +0100
 @@ -45,6 +45,8 @@
  vdpau_disabled="== VDPAU support manually disabled. =="
  xbmcprojectm_enabled="== XBMCProjectM enabled. =="
@@ -10,7 +10,7 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
  
  # External library message strings
  external_libraries_enabled="== Use of all supported external libraries enabled. =="
-@@ -149,6 +151,12 @@
+@@ -152,6 +154,12 @@
              [use_xbmcprojectm=$enableval],
              [use_xbmcprojectm=yes])
  
@@ -23,7 +23,7 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
  AC_PATH_PROG(CCACHE,ccache,none)
  AC_ARG_ENABLE([ccache],
              [AS_HELP_STRING([--enable-ccache],
-@@ -513,6 +521,15 @@
+@@ -518,6 +526,15 @@
    BUILD_XBMCPROJECTM=1
  fi
  
@@ -39,7 +39,7 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
  ### External libraries checks
  if test "$use_external_libraries" = "yes"; then
    AC_MSG_NOTICE($external_libraries_enabled)
-@@ -843,6 +860,12 @@
+@@ -850,6 +867,12 @@
    final_message="$final_message\n  XBMCProjectM:\tNo"
  fi
  
@@ -51,8 +51,8 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
 +
  if test "$use_pcre" = "yes"; then
    final_message="$final_message\n  PCRE Support:\tYes"
-   SDL_DEFINES="$SDL_DEFINES -DHAS_PCRE"
-@@ -1031,6 +1054,7 @@
+ else
+@@ -1055,6 +1078,7 @@
  AC_SUBST(BUILD_DVDCSS)
  AC_SUBST(BUILD_GOOM)
  AC_SUBST(BUILD_XBMCPROJECTM)
@@ -60,7 +60,7 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
  AC_SUBST(USE_EXTERNAL_LIBRARIES)
  AC_SUBST(USE_EXTERNAL_FFMPEG)
  AC_SUBST(USE_EXTERNAL_LIBA52)
-@@ -1427,7 +1451,7 @@
+@@ -1513,7 +1537,7 @@
        --disable-lattice \
        --disable-skyrocket
    fi
@@ -69,10 +69,10 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
  
  AC_OUTPUT
  
-diff -Naur xbmc-23782/Makefile.in xbmc-23782.patch/Makefile.in
---- xbmc-23782/Makefile.in	2009-10-17 23:10:17.769644442 +0200
-+++ xbmc-23782.patch/Makefile.in	2009-10-17 23:10:30.315519233 +0200
-@@ -90,8 +90,10 @@
+diff -Naur xbmc-24229/Makefile.in xbmc-24229.patch/Makefile.in
+--- xbmc-24229/Makefile.in	2009-11-03 12:10:59.773521297 +0100
++++ xbmc-24229.patch/Makefile.in	2009-11-03 12:11:20.957521394 +0100
+@@ -89,8 +89,10 @@
  	xbmc/lib/libid3tag \
  	xbmc/lib/libPython/linux
  
@@ -85,7 +85,7 @@ diff -Naur xbmc-23782/Makefile.in xbmc-23782.patch/Makefile.in
  
  VIS_DIRS=\
  	xbmc/visualizations/OpenGLSpectrum \
-@@ -266,7 +268,9 @@
+@@ -263,7 +265,9 @@
  endif
  endif
  screensavers: exports
diff --git a/packages/mediacenter/xbmc/patches/013_xbmc-correct_lzo_include-0.1.diff b/packages/mediacenter/xbmc/patches/013_xbmc-correct_lzo_include-0.1.diff
index 5c73bfce55..6932b4455a 100644
--- a/packages/mediacenter/xbmc/patches/013_xbmc-correct_lzo_include-0.1.diff
+++ b/packages/mediacenter/xbmc/patches/013_xbmc-correct_lzo_include-0.1.diff
@@ -1,7 +1,7 @@
-diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
---- xbmc-23782/configure.in	2009-10-17 07:13:04.000000000 +0200
-+++ xbmc-23782.patch/configure.in	2009-10-17 22:14:49.071516998 +0200
-@@ -834,12 +834,6 @@
+diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in
+--- xbmc-24229/configure.in	2009-11-03 12:13:55.310396669 +0100
++++ xbmc-24229.patch/configure.in	2009-11-03 12:12:59.285522391 +0100
+@@ -886,12 +886,6 @@
    final_message="$final_message\n  MID Support:\tNo"
  fi
  
@@ -14,9 +14,9 @@ diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
  if test "$use_ccache" = "yes"; then
    if test "$ac_cv_path_CCACHE" = "none"; then
       echo "ccache not found. Falling back to default CC"
-diff -Naur xbmc-23782/tools/TexturePacker/XBMCTex.cpp xbmc-23782.patch/tools/TexturePacker/XBMCTex.cpp
---- xbmc-23782/tools/TexturePacker/XBMCTex.cpp	2009-10-17 07:12:41.000000000 +0200
-+++ xbmc-23782.patch/tools/TexturePacker/XBMCTex.cpp	2009-10-17 22:14:04.015641625 +0200
+diff -Naur xbmc-24229/tools/TexturePacker/XBMCTex.cpp xbmc-24229.patch/tools/TexturePacker/XBMCTex.cpp
+--- xbmc-24229/tools/TexturePacker/XBMCTex.cpp	2009-11-03 10:52:18.058564764 +0100
++++ xbmc-24229.patch/tools/TexturePacker/XBMCTex.cpp	2009-11-03 12:12:59.287521636 +0100
 @@ -36,7 +36,7 @@
  #endif
  
diff --git a/packages/mediacenter/xbmc/patches/014_xbmc-dont_hardcode_usr_include-0.1.diff b/packages/mediacenter/xbmc/patches/014_xbmc-dont_hardcode_usr_include-0.1.diff
index 724ec623a0..e219f9efc4 100644
--- a/packages/mediacenter/xbmc/patches/014_xbmc-dont_hardcode_usr_include-0.1.diff
+++ b/packages/mediacenter/xbmc/patches/014_xbmc-dont_hardcode_usr_include-0.1.diff
@@ -1,24 +1,24 @@
-diff -Naur xbmc-23782/guilib/Makefile xbmc-23782.patch/guilib/Makefile
---- xbmc-23782/guilib/Makefile	2009-10-17 07:13:16.000000000 +0200
-+++ xbmc-23782.patch/guilib/Makefile	2009-10-17 22:26:41.936517267 +0200
+diff -Naur xbmc-24229/guilib/Makefile xbmc-24229.patch/guilib/Makefile
+--- xbmc-24229/guilib/Makefile	2009-11-03 10:52:46.493397566 +0100
++++ xbmc-24229.patch/guilib/Makefile	2009-11-03 12:18:27.292521966 +0100
 @@ -1,4 +1,4 @@
 -INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/cores -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/cores -I../xbmc/linux -I../xbmc/utils -I../xbmc/lib/libsquish
  
  SRCS=AnimatedGif.cpp \
       AudioContext.cpp \
-diff -Naur xbmc-23782/xbmc/FileSystem/Makefile xbmc-23782.patch/xbmc/FileSystem/Makefile
---- xbmc-23782/xbmc/FileSystem/Makefile	2009-10-17 07:09:13.000000000 +0200
-+++ xbmc-23782.patch/xbmc/FileSystem/Makefile	2009-10-17 22:26:38.683529959 +0200
+diff -Naur xbmc-24229/xbmc/FileSystem/Makefile xbmc-24229.patch/xbmc/FileSystem/Makefile
+--- xbmc-24229/xbmc/FileSystem/Makefile	2009-11-03 10:49:58.819396264 +0100
++++ xbmc-24229.patch/xbmc/FileSystem/Makefile	2009-11-03 12:18:27.293521205 +0100
 @@ -1,4 +1,4 @@
 -INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
 +INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils
  INCLUDES+=-I../lib/libcdio/libcdio/include
  
  CXXFLAGS+=-D__STDC_FORMAT_MACROS \
-diff -Naur xbmc-23782/xbmc/Makefile xbmc-23782.patch/xbmc/Makefile
---- xbmc-23782/xbmc/Makefile	2009-10-17 07:09:12.000000000 +0200
-+++ xbmc-23782.patch/xbmc/Makefile	2009-10-17 22:25:18.953643441 +0200
+diff -Naur xbmc-24229/xbmc/Makefile xbmc-24229.patch/xbmc/Makefile
+--- xbmc-24229/xbmc/Makefile	2009-11-03 10:49:58.642519675 +0100
++++ xbmc-24229.patch/xbmc/Makefile	2009-11-03 12:18:27.295522056 +0100
 @@ -1,4 +1,4 @@
 -INCLUDES+=-I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -I/usr/include/freetype2 -Icores/dvdplayer -Icores/ffmpeg
 +INCLUDES+=-I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -Icores/dvdplayer -Icores/ffmpeg
diff --git a/packages/mediacenter/xbmc/patches/015_xbmc-crosscompiling-add_LDFLAGS-0.1.diff b/packages/mediacenter/xbmc/patches/015_xbmc-crosscompiling-add_LDFLAGS-0.1.diff
index bf0cb2c146..d32ceafb39 100644
--- a/packages/mediacenter/xbmc/patches/015_xbmc-crosscompiling-add_LDFLAGS-0.1.diff
+++ b/packages/mediacenter/xbmc/patches/015_xbmc-crosscompiling-add_LDFLAGS-0.1.diff
@@ -1,6 +1,6 @@
-diff -Naur xbmc-23782/Makefile.include.in xbmc-23782.patch/Makefile.include.in
---- xbmc-23782/Makefile.include.in	2009-10-17 07:12:34.000000000 +0200
-+++ xbmc-23782.patch/Makefile.include.in	2009-10-18 00:22:42.195445274 +0200
+diff -Naur xbmc-24229/Makefile.include.in xbmc-24229.patch/Makefile.include.in
+--- xbmc-24229/Makefile.include.in	2009-11-03 10:52:12.856552394 +0100
++++ xbmc-24229.patch/Makefile.include.in	2009-11-03 12:22:49.093534590 +0100
 @@ -11,6 +11,7 @@
  CXXFLAGS+=@DEBUG_FLAGS@
  CFLAGS+=@CFLAGS@
diff --git a/packages/mediacenter/xbmc/patches/015_xbmc-xrandr_reassing_symbol_clone-0.1.diff b/packages/mediacenter/xbmc/patches/015_xbmc-xrandr_reassing_symbol_clone-0.1.diff
index d7f1ed0c0e..6c0980345b 100644
--- a/packages/mediacenter/xbmc/patches/015_xbmc-xrandr_reassing_symbol_clone-0.1.diff
+++ b/packages/mediacenter/xbmc/patches/015_xbmc-xrandr_reassing_symbol_clone-0.1.diff
@@ -1,7 +1,7 @@
-diff -Naur xbmc-23757/xbmc-xrandr.c xbmc-23757.patch/xbmc-xrandr.c
---- xbmc-23757/xbmc-xrandr.c	2009-10-17 05:39:09.651516826 +0200
-+++ xbmc-23757.patch/xbmc-xrandr.c	2009-10-17 05:38:31.000000000 +0200
-@@ -189,7 +189,7 @@
+diff -Naur xbmc-24229/xbmc-xrandr.c xbmc-24229.patch/xbmc-xrandr.c
+--- xbmc-24229/xbmc-xrandr.c	2009-11-03 10:49:57.326407887 +0100
++++ xbmc-24229.patch/xbmc-xrandr.c	2009-11-03 12:26:47.836525466 +0100
+@@ -190,7 +190,7 @@
  
  #if HAS_RANDR_1_2
  typedef enum _policy {
@@ -10,7 +10,7 @@ diff -Naur xbmc-23757/xbmc-xrandr.c xbmc-23757.patch/xbmc-xrandr.c
  } policy_t;
  
  typedef enum _relation {
-@@ -1611,7 +1611,7 @@
+@@ -1576,7 +1576,7 @@
      int		ret = 0;
  #if HAS_RANDR_1_2
      output_t	*output = NULL;
@@ -19,7 +19,7 @@ diff -Naur xbmc-23757/xbmc-xrandr.c xbmc-23757.patch/xbmc-xrandr.c
      Bool    	setit_1_2 = False;
      Bool    	query_1_2 = False;
      Bool	modeit = False;
-@@ -1872,7 +1872,7 @@
+@@ -1837,7 +1837,7 @@
  	    continue;
  	}
  	if (!strcmp ("--clone", argv[i])) {
@@ -28,7 +28,7 @@ diff -Naur xbmc-23757/xbmc-xrandr.c xbmc-23757.patch/xbmc-xrandr.c
  	    setit_1_2 = True;
  	    continue;
  	}
-@@ -2306,9 +2306,9 @@
+@@ -2269,9 +2269,9 @@
  		printf ("\tClones:    ");
  		for (j = 0; j < output_info->nclone; j++)
  		{
diff --git a/packages/mediacenter/xbmc/patches/020_xbmc-uclibc_has_no_fileno-0.2.diff b/packages/mediacenter/xbmc/patches/020_xbmc-uclibc_has_no_fileno-0.2.diff
index e209c55bb6..ebb8e6efe6 100644
--- a/packages/mediacenter/xbmc/patches/020_xbmc-uclibc_has_no_fileno-0.2.diff
+++ b/packages/mediacenter/xbmc/patches/020_xbmc-uclibc_has_no_fileno-0.2.diff
@@ -1,6 +1,6 @@
-diff -Naur xbmc-23757/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h xbmc-23757.patch/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h
---- xbmc-23757/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h	2009-10-16 18:44:08.000000000 +0200
-+++ xbmc-23757.patch/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h	2009-10-16 20:08:13.747643850 +0200
+diff -Naur xbmc-24229/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h xbmc-24229.patch/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h
+--- xbmc-24229/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h	2009-11-03 10:51:21.827519184 +0100
++++ xbmc-24229.patch/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h	2009-11-03 12:31:01.038437018 +0100
 @@ -29,10 +29,14 @@
  
  class CMutex;
diff --git a/packages/mediacenter/xbmc/patches/021_xbmc-check_yield_funcs-0.1.diff b/packages/mediacenter/xbmc/patches/021_xbmc-check_yield_funcs-0.1.diff
index ba50385fde..9840e557f6 100644
--- a/packages/mediacenter/xbmc/patches/021_xbmc-check_yield_funcs-0.1.diff
+++ b/packages/mediacenter/xbmc/patches/021_xbmc-check_yield_funcs-0.1.diff
@@ -1,25 +1,22 @@
-diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
---- xbmc-23782/configure.in	2009-10-17 07:13:04.000000000 +0200
-+++ xbmc-23782.patch/configure.in	2009-10-18 19:30:30.994320947 +0200
-@@ -327,6 +327,15 @@
+diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in
+--- xbmc-24229/configure.in	2009-11-03 12:18:12.098521374 +0100
++++ xbmc-24229.patch/configure.in	2009-11-03 12:37:53.688395337 +0100
+@@ -350,6 +350,12 @@
+ 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))
- 
-+AC_CHECK_LIB([pthread],[pthread_yield], 
-+            AC_DEFINE([HAVE_PTHREAD_YIELD], [1],
-+            [Define to 1 if you have the 'pthread_yield' function]))
-+
-+AC_CHECK_LIB([pthread],[sched_yield],
-+            AC_DEFINE([HAVE_SCHED_YIELD], [1],
-+            [Define to 1 if you have the 'sched_yield' function]))
-+
-+
++AC_CHECK_LIB([pthread],     [pthread_yield], 
++                  AC_DEFINE([HAVE_PTHREAD_YIELD], [1],
++                  [Define to 1 if you have the 'pthread_yield' function]))
++AC_CHECK_LIB([pthread],     [sched_yield],
++                  AC_DEFINE([HAVE_SCHED_YIELD], [1],
++                  [Define to 1 if you have the 'sched_yield' function]))
  PKG_CHECK_MODULES([MAD],        [mad],
                    [INCLUDES+=" $MAD_CFLAGS"; LIBS+=" $MAD_LIBS"],
                    AC_MSG_ERROR($missing_library))
-diff -Naur xbmc-23782/xbmc/FileSystem/FileCurl.cpp xbmc-23782.patch/xbmc/FileSystem/FileCurl.cpp
---- xbmc-23782/xbmc/FileSystem/FileCurl.cpp	2009-10-17 07:09:13.000000000 +0200
-+++ xbmc-23782.patch/xbmc/FileSystem/FileCurl.cpp	2009-10-18 19:24:45.938445349 +0200
+diff -Naur xbmc-24229/xbmc/FileSystem/FileCurl.cpp xbmc-24229.patch/xbmc/FileSystem/FileCurl.cpp
+--- xbmc-24229/xbmc/FileSystem/FileCurl.cpp	2009-11-03 10:49:58.898396757 +0100
++++ xbmc-24229.patch/xbmc/FileSystem/FileCurl.cpp	2009-11-03 12:35:23.238521816 +0100
 @@ -19,6 +19,8 @@
   *
   */
diff --git a/packages/mediacenter/xbmc/patches/022_xbmc-check_pthread_get_cpuclockid_funcs-0.1.diff b/packages/mediacenter/xbmc/patches/022_xbmc-check_pthread_get_cpuclockid_funcs-0.1.diff
index c93a686a57..cdd1b08917 100644
--- a/packages/mediacenter/xbmc/patches/022_xbmc-check_pthread_get_cpuclockid_funcs-0.1.diff
+++ b/packages/mediacenter/xbmc/patches/022_xbmc-check_pthread_get_cpuclockid_funcs-0.1.diff
@@ -1,19 +1,19 @@
-diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
---- xbmc-23782/configure.in	2009-10-18 19:54:36.828319917 +0200
-+++ xbmc-23782.patch/configure.in	2009-10-18 19:55:57.901319613 +0200
-@@ -335,6 +335,9 @@
-             AC_DEFINE([HAVE_SCHED_YIELD], [1],
-             [Define to 1 if you have the 'sched_yield' function]))
+diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in
+--- xbmc-24229/configure.in	2009-11-03 12:39:23.963428747 +0100
++++ xbmc-24229.patch/configure.in	2009-11-03 12:39:40.036396583 +0100
+@@ -336,6 +336,9 @@
+   AC_CHECK_LIB([SDL_gfx], [main])
+ fi
  
 +AC_CHECK_LIB([pthread],[pthread_getcpuclockid],
 +            AC_DEFINE([HAVE_PTHREAD_GETCPUCLOCKID], [1],
 +            [Define to 1 if you have the 'pthread_getcpuclockid' function]))
  
- PKG_CHECK_MODULES([MAD],        [mad],
-                   [INCLUDES+=" $MAD_CFLAGS"; LIBS+=" $MAD_LIBS"],
-diff -Naur xbmc-23782/xbmc/linux/XThreadUtils.cpp xbmc-23782.patch/xbmc/linux/XThreadUtils.cpp
---- xbmc-23782/xbmc/linux/XThreadUtils.cpp	2009-10-17 07:09:25.000000000 +0200
-+++ xbmc-23782.patch/xbmc/linux/XThreadUtils.cpp	2009-10-18 20:01:02.496322443 +0200
+ # platform independent libraries
+ AC_CHECK_HEADER([mad.h],,            AC_MSG_ERROR($missing_library))
+diff -Naur xbmc-24229/xbmc/linux/XThreadUtils.cpp xbmc-24229.patch/xbmc/linux/XThreadUtils.cpp
+--- xbmc-24229/xbmc/linux/XThreadUtils.cpp	2009-11-03 10:50:11.248527059 +0100
++++ xbmc-24229.patch/xbmc/linux/XThreadUtils.cpp	2009-11-03 12:39:40.038397087 +0100
 @@ -19,6 +19,8 @@
   *
   */
diff --git a/packages/mediacenter/xbmc/patches/023_xbmc-check_xstat64_and_lxstat64_funcs-0.1.diff b/packages/mediacenter/xbmc/patches/023_xbmc-check_xstat64_and_lxstat64_funcs-0.1.diff
index c140b59a9b..c588c4f2ff 100644
--- a/packages/mediacenter/xbmc/patches/023_xbmc-check_xstat64_and_lxstat64_funcs-0.1.diff
+++ b/packages/mediacenter/xbmc/patches/023_xbmc-check_xstat64_and_lxstat64_funcs-0.1.diff
@@ -1,24 +1,22 @@
-diff -Naur xbmc-23782/configure.in xbmc-23782.patch/configure.in
---- xbmc-23782/configure.in	2009-10-18 20:25:59.990447343 +0200
-+++ xbmc-23782.patch/configure.in	2009-10-18 21:19:15.187446224 +0200
-@@ -339,6 +339,14 @@
-             AC_DEFINE([HAVE_PTHREAD_GETCPUCLOCKID], [1],
-             [Define to 1 if you have the 'pthread_getcpuclockid' function]))
- 
-+AC_CHECK_LIB([c],[__xstat64],
-+            AC_DEFINE([HAVE_XSTAT64], [1],
-+            [Define to 1 if you have the '__xstat64' function]))
-+
-+AC_CHECK_LIB([c],[__lxstat64],
-+            AC_DEFINE([HAVE_LXSTAT64], [1],
-+            [Define to 1 if you have the '__lxstat64' function]))
-+
+diff -Naur xbmc-24229/configure.in xbmc-24229.patch/configure.in
+--- xbmc-24229/configure.in	2009-11-03 12:40:25.588436224 +0100
++++ xbmc-24229.patch/configure.in	2009-11-03 12:43:02.056519683 +0100
+@@ -359,6 +359,12 @@
+ AC_CHECK_LIB([pthread],     [sched_yield],
+                   AC_DEFINE([HAVE_SCHED_YIELD], [1],
+                   [Define to 1 if you have the 'sched_yield' function]))
++AC_CHECK_LIB([c],           [__xstat64],
++                  AC_DEFINE([HAVE_XSTAT64], [1],
++                  [Define to 1 if you have the '__xstat64' function]))
++AC_CHECK_LIB([c],           [__lxstat64],
++                  AC_DEFINE([HAVE_LXSTAT64], [1],
++                  [Define to 1 if you have the '__lxstat64' function]))
  PKG_CHECK_MODULES([MAD],        [mad],
                    [INCLUDES+=" $MAD_CFLAGS"; LIBS+=" $MAD_LIBS"],
                    AC_MSG_ERROR($missing_library))
-diff -Naur xbmc-23782/xbmc/cores/DllLoader/exports/exports_python_linux.cpp xbmc-23782.patch/xbmc/cores/DllLoader/exports/exports_python_linux.cpp
---- xbmc-23782/xbmc/cores/DllLoader/exports/exports_python_linux.cpp	2009-10-17 07:11:17.000000000 +0200
-+++ xbmc-23782.patch/xbmc/cores/DllLoader/exports/exports_python_linux.cpp	2009-10-18 21:22:22.135447782 +0200
+diff -Naur xbmc-24229/xbmc/cores/DllLoader/exports/exports_python_linux.cpp xbmc-24229.patch/xbmc/cores/DllLoader/exports/exports_python_linux.cpp
+--- xbmc-24229/xbmc/cores/DllLoader/exports/exports_python_linux.cpp	2009-11-03 10:51:21.801520187 +0100
++++ xbmc-24229.patch/xbmc/cores/DllLoader/exports/exports_python_linux.cpp	2009-11-03 12:40:50.204524744 +0100
 @@ -19,6 +19,8 @@
   *
   */
diff --git a/packages/mediacenter/xbmc/patches/072-xbmc-change_default_skin-0.1.diff b/packages/mediacenter/xbmc/patches/072-xbmc-change_default_skin-0.1.diff
new file mode 100644
index 0000000000..33a51e0a9b
--- /dev/null
+++ b/packages/mediacenter/xbmc/patches/072-xbmc-change_default_skin-0.1.diff
@@ -0,0 +1,12 @@
+diff -Naur xbmc-24229/xbmc/Settings.h xbmc-24229.patch/xbmc/Settings.h
+--- xbmc-24229/xbmc/Settings.h	2009-11-03 10:50:13.106418518 +0100
++++ xbmc-24229.patch/xbmc/Settings.h	2009-11-03 12:50:04.017521297 +0100
+@@ -27,7 +27,7 @@
+ #define DEFAULT_VSYNC       VSYNC_DISABLED
+ #define DEFAULT_THUMB_SIZE  256
+ #else  // MID
+-#define DEFAULT_SKIN        "PM3.HD"
++#define DEFAULT_SKIN        "Vision2"
+ #if defined(__APPLE__) || defined(_WIN32)
+ #define DEFAULT_VSYNC       VSYNC_ALWAYS
+ #else
diff --git a/packages/mediacenter/xbmc/patches/072-xbmc-openelec_reenable_networksettings-0.1.diff b/packages/mediacenter/xbmc/patches/072-xbmc-openelec_reenable_networksettings-0.1.diff
new file mode 100644
index 0000000000..762bb861a5
--- /dev/null
+++ b/packages/mediacenter/xbmc/patches/072-xbmc-openelec_reenable_networksettings-0.1.diff
@@ -0,0 +1,52 @@
+diff -Naur xbmc-24233/xbmc/GUISettings.cpp xbmc-24233.patch/xbmc/GUISettings.cpp
+--- xbmc-24233/xbmc/GUISettings.cpp	2009-11-03 13:43:17.810534312 +0100
++++ xbmc-24233.patch/xbmc/GUISettings.cpp	2009-11-03 14:57:33.414520535 +0100
+@@ -493,20 +493,20 @@
+   if (g_application.IsStandAlone())
+   {
+ #ifndef __APPLE__
+-    AddString(0, "network.interface",775,"", SPIN_CONTROL_TEXT);
+-    AddInt(0, "network.assignment", 715, NETWORK_DHCP, NETWORK_DHCP, 1, NETWORK_DISABLED, SPIN_CONTROL_TEXT);
+-    AddString(0, "network.ipaddress", 719, "0.0.0.0", EDIT_CONTROL_IP_INPUT);
+-    AddString(0, "network.subnet", 720, "255.255.255.0", EDIT_CONTROL_IP_INPUT);
+-    AddString(0, "network.gateway", 721, "0.0.0.0", EDIT_CONTROL_IP_INPUT);
+-    AddString(0, "network.dns", 722, "0.0.0.0", EDIT_CONTROL_IP_INPUT);
+-    AddString(0, "network.dnssuffix", 22002, "", EDIT_CONTROL_INPUT, true);
+-    AddString(0, "network.essid", 776, "0.0.0.0", BUTTON_CONTROL_STANDARD);
+-    AddInt(0, "network.enc", 778, ENC_NONE, ENC_NONE, 1, ENC_WPA2, SPIN_CONTROL_TEXT);
+-    AddString(0, "network.key", 777, "0.0.0.0", EDIT_CONTROL_INPUT);
++    AddString(1, "network.interface",775,"", SPIN_CONTROL_TEXT);
++    AddInt(2, "network.assignment", 715, NETWORK_DHCP, NETWORK_DHCP, 1, NETWORK_DISABLED, SPIN_CONTROL_TEXT);
++    AddString(3, "network.ipaddress", 719, "0.0.0.0", EDIT_CONTROL_IP_INPUT);
++    AddString(4, "network.subnet", 720, "255.255.255.0", EDIT_CONTROL_IP_INPUT);
++    AddString(5, "network.gateway", 721, "0.0.0.0", EDIT_CONTROL_IP_INPUT);
++    AddString(6, "network.dns", 722, "0.0.0.0", EDIT_CONTROL_IP_INPUT);
++    AddString(7, "network.dnssuffix", 22002, "", EDIT_CONTROL_INPUT, true);
++    AddString(8, "network.essid", 776, "0.0.0.0", BUTTON_CONTROL_STANDARD);
++    AddInt(9, "network.enc", 778, ENC_NONE, ENC_NONE, 1, ENC_WPA2, SPIN_CONTROL_TEXT);
++    AddString(10, "network.key", 777, "0.0.0.0", EDIT_CONTROL_INPUT);
+ #ifndef _WIN32
+-    AddString(0, "network.save", 779, "", BUTTON_CONTROL_STANDARD);
++    AddString(11, "network.save", 779, "", BUTTON_CONTROL_STANDARD);
+ #endif
+-    AddSeparator(0, "network.sep1");
++    AddSeparator(12, "network.sep1");
+ #endif
+   }
+   AddBool(13, "network.usehttpproxy", 708, false);
+diff -Naur xbmc-24233/xbmc/GUIWindowSettingsCategory.cpp xbmc-24233.patch/xbmc/GUIWindowSettingsCategory.cpp
+--- xbmc-24233/xbmc/GUIWindowSettingsCategory.cpp	2009-11-03 13:43:28.129521550 +0100
++++ xbmc-24233.patch/xbmc/GUIWindowSettingsCategory.cpp	2009-11-03 10:50:13.000000000 +0100
+@@ -3702,7 +3702,12 @@
+ 
+ void CGUIWindowSettingsCategory::NetworkInterfaceChanged(void)
+ {
++  if (!g_application.IsStandAlone())
++    return;
++
++#ifdef __APPLE__
+   return;
++#endif
+ 
+    NetworkAssignment iAssignment;
+    CStdString sIPAddress;
diff --git a/packages/mediacenter/xbmc/patches/pvr_initial-24008.diff b/packages/mediacenter/xbmc/patches/pvr_initial-24008.diff
deleted file mode 100644
index 293ce5ab1c..0000000000
Binary files a/packages/mediacenter/xbmc/patches/pvr_initial-24008.diff and /dev/null differ
diff --git a/packages/mediacenter/xbmc/url b/packages/mediacenter/xbmc/url
index 73b71d9719..90873256be 100644
--- a/packages/mediacenter/xbmc/url
+++ b/packages/mediacenter/xbmc/url
@@ -1 +1 @@
-http://sources.openelec.tv/svn/xbmc-24059.tar.bz2
+http://sources.openelec.tv/svn/xbmc-24273.tar.bz2