diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index 59743269e8..e3741d2eae 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -46,8 +46,6 @@ $SCRIPTS/build faad2
 $SCRIPTS/build flac
 $SCRIPTS/build wavpack
 $SCRIPTS/build libmpeg2
-$SCRIPTS/build libvpx
-# $SCRIPTS/build musepack
 
 $SCRIPTS/build SDL         #?
 $SCRIPTS/build SDL_mixer   #?
diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install
index a7bb1f581e..85d48a8c6a 100755
--- a/packages/mediacenter/xbmc/install
+++ b/packages/mediacenter/xbmc/install
@@ -45,8 +45,6 @@ $SCRIPTS/install faad2
 $SCRIPTS/install flac
 $SCRIPTS/install wavpack
 $SCRIPTS/install libmpeg2
-$SCRIPTS/install libvpx
-# $SCRIPTS/install musepack
 
 $SCRIPTS/install SDL
 $SCRIPTS/install SDL_mixer
diff --git a/packages/mediacenter/xbmc/patches/201_xbmc-let_select_XBMCProjectM-0.1.diff b/packages/mediacenter/xbmc/patches/201_xbmc-let_select_XBMCProjectM-0.1.diff
index 33c0014936..8da9696e60 100644
--- a/packages/mediacenter/xbmc/patches/201_xbmc-let_select_XBMCProjectM-0.1.diff
+++ b/packages/mediacenter/xbmc/patches/201_xbmc-let_select_XBMCProjectM-0.1.diff
@@ -1,6 +1,6 @@
-diff -Naur xbmc-30587/configure.in xbmc-30587.patch/configure.in
---- xbmc-30587/configure.in	2010-05-26 12:00:33.000000000 +0200
-+++ xbmc-30587.patch/configure.in	2010-05-26 12:23:05.551857623 +0200
+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 @@
  xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. =="
  goom_enabled="== GOOM enabled. =="
@@ -10,7 +10,7 @@ diff -Naur xbmc-30587/configure.in xbmc-30587.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. =="
-@@ -156,6 +158,12 @@
+@@ -161,6 +163,12 @@
    [use_goom=$enableval],
    [use_goom=no])
  
@@ -23,9 +23,9 @@ diff -Naur xbmc-30587/configure.in xbmc-30587.patch/configure.in
  AC_ARG_ENABLE([ccache],
    [AS_HELP_STRING([--enable-ccache],
    [enable building with ccache feature (default is auto)])],
-@@ -669,6 +677,15 @@
-   fi
- fi
+@@ -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))
  
 +# XBMCPROJECTM
 +if test "$use_xbmcprojectm" = "yes"; then
@@ -39,7 +39,7 @@ diff -Naur xbmc-30587/configure.in xbmc-30587.patch/configure.in
  ### External libraries checks
  # External FFmpeg
  if test "$use_external_ffmpeg" = "yes"; then
-@@ -1080,6 +1097,12 @@
+@@ -1132,6 +1149,12 @@
    final_message="$final_message\n  GOOM:\t\tNo"
  fi
  
@@ -52,15 +52,15 @@ diff -Naur xbmc-30587/configure.in xbmc-30587.patch/configure.in
  if test "$use_mid" = "yes"; then
    final_message="$final_message\n  MID Support:\tYes"
    SDL_DEFINES="$SDL_DEFINES -DMID"
-@@ -1333,6 +1356,7 @@
+@@ -1401,6 +1424,7 @@
  AC_SUBST(SDL_DEFINES)
  AC_SUBST(BUILD_DVDCSS)
  AC_SUBST(BUILD_GOOM)
 +AC_SUBST(BUILD_XBMCPROJECTM)
  AC_SUBST(USE_EXTERNAL_FFMPEG)
  AC_SUBST(USE_EXTERNAL_LIBA52)
- AC_SUBST(USE_EXTERNAL_LIBASS)
-@@ -1715,7 +1739,7 @@
+ AC_SUBST(USE_INTERNAL_LIBA52)
+@@ -1788,7 +1812,7 @@
        -DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" .
  set +x
    fi
@@ -69,10 +69,10 @@ diff -Naur xbmc-30587/configure.in xbmc-30587.patch/configure.in
  
  XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
    if test "$host_vendor" != "apple" ; then
-diff -Naur xbmc-30587/Makefile.in xbmc-30587.patch/Makefile.in
---- xbmc-30587/Makefile.in	2010-05-26 12:00:33.000000000 +0200
-+++ xbmc-30587.patch/Makefile.in	2010-05-26 12:23:05.553857450 +0200
-@@ -106,8 +106,10 @@
+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 @@
  
  VIS_DIRS=\
  	xbmc/visualizations/OpenGLSpectrum \
diff --git a/packages/mediacenter/xbmc/patches/202_xbmc-let_select_RSXS-0.1.diff b/packages/mediacenter/xbmc/patches/202_xbmc-let_select_RSXS-0.1.diff
index aa8befb469..40a0cc8094 100644
--- a/packages/mediacenter/xbmc/patches/202_xbmc-let_select_RSXS-0.1.diff
+++ b/packages/mediacenter/xbmc/patches/202_xbmc-let_select_RSXS-0.1.diff
@@ -1,6 +1,6 @@
-diff -Naur xbmc-30587/configure.in xbmc-30587.patch/configure.in
---- xbmc-30587/configure.in	2010-05-26 12:59:31.798732689 +0200
-+++ xbmc-30587.patch/configure.in	2010-05-26 13:00:28.957732474 +0200
+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 @@
  goom_disabled="== GOOM disabled. =="
  xbmcprojectm_enabled="== XBMCProjectM enabled. =="
@@ -10,7 +10,7 @@ diff -Naur xbmc-30587/configure.in xbmc-30587.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. =="
-@@ -164,6 +166,12 @@
+@@ -169,6 +171,12 @@
              [use_xbmcprojectm=$enableval],
              [use_xbmcprojectm=yes])
  
@@ -23,7 +23,7 @@ diff -Naur xbmc-30587/configure.in xbmc-30587.patch/configure.in
  AC_ARG_ENABLE([ccache],
    [AS_HELP_STRING([--enable-ccache],
    [enable building with ccache feature (default is auto)])],
-@@ -686,6 +694,15 @@
+@@ -742,6 +750,15 @@
    BUILD_XBMCPROJECTM=1
  fi
  
@@ -39,7 +39,7 @@ diff -Naur xbmc-30587/configure.in xbmc-30587.patch/configure.in
  ### External libraries checks
  # External FFmpeg
  if test "$use_external_ffmpeg" = "yes"; then
-@@ -1103,6 +1120,12 @@
+@@ -1155,6 +1172,12 @@
    final_message="$final_message\n  XBMCProjectM:\tNo"
  fi
  
@@ -52,15 +52,15 @@ diff -Naur xbmc-30587/configure.in xbmc-30587.patch/configure.in
  if test "$use_mid" = "yes"; then
    final_message="$final_message\n  MID Support:\tYes"
    SDL_DEFINES="$SDL_DEFINES -DMID"
-@@ -1357,6 +1380,7 @@
+@@ -1425,6 +1448,7 @@
  AC_SUBST(BUILD_DVDCSS)
  AC_SUBST(BUILD_GOOM)
  AC_SUBST(BUILD_XBMCPROJECTM)
 +AC_SUBST(BUILD_RSXS)
  AC_SUBST(USE_EXTERNAL_FFMPEG)
  AC_SUBST(USE_EXTERNAL_LIBA52)
- AC_SUBST(USE_EXTERNAL_LIBASS)
-@@ -1795,7 +1819,7 @@
+ AC_SUBST(USE_INTERNAL_LIBA52)
+@@ -1866,7 +1890,7 @@
        --disable-skyrocket
    fi
  fi
@@ -69,10 +69,10 @@ diff -Naur xbmc-30587/configure.in xbmc-30587.patch/configure.in
  
  XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
    if test "$host_vendor" = "apple" ; then
-diff -Naur xbmc-30587/Makefile.in xbmc-30587.patch/Makefile.in
---- xbmc-30587/Makefile.in	2010-05-26 12:59:31.799730855 +0200
-+++ xbmc-30587.patch/Makefile.in	2010-05-26 12:59:41.162732822 +0200
-@@ -101,8 +101,10 @@
+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 --git a/packages/mediacenter/xbmc/patches/221_xbmc-let_select_external_zlib-0.1.diff b/packages/mediacenter/xbmc/patches/221_xbmc-let_select_external_zlib-0.1.diff
index 4b2a890d26..08402fd159 100644
--- a/packages/mediacenter/xbmc/patches/221_xbmc-let_select_external_zlib-0.1.diff
+++ b/packages/mediacenter/xbmc/patches/221_xbmc-let_select_external_zlib-0.1.diff
@@ -1,7 +1,7 @@
-diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in
---- xbmc-30122/configure.in	2010-05-13 22:16:11.524199498 +0200
-+++ xbmc-30122.patch/configure.in	2010-05-13 22:23:00.332323274 +0200
-@@ -58,6 +58,8 @@
+diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
+--- xbmc-31903/configure.in	2010-07-17 16:48:30.812376923 +0200
++++ xbmc-31903.patch/configure.in	2010-07-17 16:49:06.305376455 +0200
+@@ -61,6 +61,8 @@
  external_liba52_disabled="== Use of external liba52 disabled. =="
  external_libdts_enabled="== Use of external libdts enabled. =="
  external_libdts_disabled="== Use of external libdts disabled. =="
@@ -10,9 +10,9 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in
  external_python_enabled="== Use of external python enabled. =="
  external_python_disabled="== Use of external python disabled. =="
  ffmpeg_vdpau_not_supported="== External ffmpeg doesn't support VDPAU. VDPAU support disabled. =="
-@@ -282,6 +284,12 @@
-             [use_external_libdts=$enableval],
-             [use_external_libdts=$use_external_libraries])
+@@ -287,6 +289,12 @@
+   [use_external_libdts=$enableval],
+   [use_external_libdts=$use_external_libraries])
  
 +AC_ARG_ENABLE([external-libz],
 +            [AS_HELP_STRING([--enable-external-libz],
@@ -21,9 +21,9 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in
 +            [use_external_libz=no])
 +
  AC_ARG_ENABLE([external-python],
-             [AS_HELP_STRING([--enable-external-python],
-             [enable use of external python library (default is no) 'Linux only'])],
-@@ -721,6 +729,18 @@
+   [AS_HELP_STRING([--enable-external-python],
+   [enable use of external python library (default is no) 'Linux only'])],
+@@ -848,6 +856,18 @@
    USE_EXTERNAL_LIBDTS=0
  fi
  
@@ -42,7 +42,7 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in
  # External Python
  if test "$use_external_python" = "yes"; then
    AC_CHECK_LIB([python2.6], [main],
-@@ -1195,6 +1215,11 @@
+@@ -1353,6 +1373,11 @@
      final_message="$final_message\n  External libdts:\tNo"
    fi
  fi
@@ -54,8 +54,8 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in
  if test "$use_external_python" = "yes"; then
    final_message="$final_message\n  External Python:\tYes"
  else
-@@ -1627,7 +1652,7 @@
-     CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
+@@ -1791,7 +1816,7 @@
+     CFLAGS="$CFLAGS -fno-common" \
      ./configure
    fi
 -], [0])
diff --git a/packages/mediacenter/xbmc/patches/301_xbmc-correct_lzo_include-0.1.diff b/packages/mediacenter/xbmc/patches/301_xbmc-correct_lzo_include-0.1.diff
index 9622caa66b..d9b5732f81 100644
--- a/packages/mediacenter/xbmc/patches/301_xbmc-correct_lzo_include-0.1.diff
+++ b/packages/mediacenter/xbmc/patches/301_xbmc-correct_lzo_include-0.1.diff
@@ -1,7 +1,7 @@
-diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in
---- xbmc-30122/configure.in	2010-05-13 13:51:13.813324070 +0200
-+++ xbmc-30122.patch/configure.in	2010-05-13 13:52:55.358197998 +0200
-@@ -1065,12 +1065,6 @@
+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
  
@@ -14,9 +14,9 @@ diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in
  if test "x$use_ccache" != "xno"; then
    AC_PATH_PROG(CCACHE,ccache,none)
    if test "$ac_cv_path_CCACHE" = "none"; then
-diff -Naur xbmc-30122/tools/TexturePacker/XBMCTex.cpp xbmc-30122.patch/tools/TexturePacker/XBMCTex.cpp
---- xbmc-30122/tools/TexturePacker/XBMCTex.cpp	2010-05-13 13:20:20.000000000 +0200
-+++ xbmc-30122.patch/tools/TexturePacker/XBMCTex.cpp	2010-05-13 13:51:39.760198949 +0200
+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
  
diff --git a/packages/mediacenter/xbmc/patches/401-xbmc-we_dont_need_libXinerama-0.1.diff b/packages/mediacenter/xbmc/patches/401-xbmc-we_dont_need_libXinerama-0.1.diff
index 0734ba2059..c3e6dea659 100644
--- a/packages/mediacenter/xbmc/patches/401-xbmc-we_dont_need_libXinerama-0.1.diff
+++ b/packages/mediacenter/xbmc/patches/401-xbmc-we_dont_need_libXinerama-0.1.diff
@@ -1,7 +1,7 @@
-diff -Naur xbmc-30587/configure.in xbmc-30587.patch/configure.in
---- xbmc-30587/configure.in	2010-05-26 12:27:28.620730606 +0200
-+++ xbmc-30587.patch/configure.in	2010-05-26 12:29:17.460731872 +0200
-@@ -531,9 +531,6 @@
+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 @@
    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/402-xbmc-enable_yasm_in_ffmpeg-0.1.diff b/packages/mediacenter/xbmc/patches/402-xbmc-enable_yasm_in_ffmpeg-0.1.diff
index 83c96162c2..f2db6fd5a2 100644
--- a/packages/mediacenter/xbmc/patches/402-xbmc-enable_yasm_in_ffmpeg-0.1.diff
+++ b/packages/mediacenter/xbmc/patches/402-xbmc-enable_yasm_in_ffmpeg-0.1.diff
@@ -1,7 +1,7 @@
-diff -Naur xbmc-30587/configure.in xbmc-30587.patch/configure.in
---- xbmc-30587/configure.in	2010-05-26 12:30:34.583732752 +0200
-+++ xbmc-30587.patch/configure.in	2010-05-26 12:33:26.657731562 +0200
-@@ -941,6 +941,7 @@
+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
  
@@ -9,13 +9,11 @@ diff -Naur xbmc-30587/configure.in xbmc-30587.patch/configure.in
  AC_CHECK_PROG(HAVE_SVNVERSION,svnversion,"yes","no",)
  AC_CHECK_PROG(HAVE_GIT,git,"yes","no",)
  
-@@ -1569,7 +1570,8 @@
-       --enable-protocol=http \
-       --enable-pthreads \
-       `case $host_cpu in powerpc*|arm*) echo --enable-pic ;; esac` \
--      --cc="$CC"
-+      --cc="$CC" \
-+      `if test "$HAVE_YASM" = "yes"; then echo --enable-yasm; fi`
-   fi
- ], [$USE_EXTERNAL_FFMPEG])
- 
+@@ -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/url b/packages/mediacenter/xbmc/url
index 68f5cbcd4d..ecd8077fb5 100644
--- a/packages/mediacenter/xbmc/url
+++ b/packages/mediacenter/xbmc/url
@@ -1 +1 @@
-http://sources.openelec.tv/svn/xbmc-31690.tar.bz2
+http://sources.openelec.tv/svn/xbmc-31903.tar.bz2