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 7ea8b5abbd..459a4eb4dd 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-29740/configure.in xbmc-29740.patch/configure.in
---- xbmc-29740/configure.in	2010-05-03 03:25:29.000000000 +0200
-+++ xbmc-29740.patch/configure.in	2010-05-03 04:05:13.412131036 +0200
+diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in
+--- xbmc-30122/configure.in	2010-05-13 13:16:42.000000000 +0200
++++ xbmc-30122.patch/configure.in	2010-05-13 13:44:00.985198286 +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-29740/configure.in xbmc-29740.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. =="
-@@ -168,6 +170,12 @@
+@@ -170,6 +172,12 @@
              [use_goom=$enableval],
              [use_goom=no])
  
@@ -20,10 +20,10 @@ diff -Naur xbmc-29740/configure.in xbmc-29740.patch/configure.in
 +            [use_xbmcprojectm=$enableval],
 +            [use_xbmcprojectm=yes])
 +
- AC_PATH_PROG(CCACHE,ccache,none)
  AC_ARG_ENABLE([ccache],
              [AS_HELP_STRING([--enable-ccache],
-@@ -579,6 +587,15 @@
+                [enable building with ccache feature (default is auto)])],
+@@ -608,6 +616,15 @@
    fi
  fi
  
@@ -39,7 +39,7 @@ diff -Naur xbmc-29740/configure.in xbmc-29740.patch/configure.in
  ### External libraries checks
  # External FFmpeg
  if test "$use_external_ffmpeg" = "yes"; then
-@@ -943,6 +960,12 @@
+@@ -992,6 +1009,12 @@
    final_message="$final_message\n  GOOM:\t\tNo"
  fi
  
@@ -49,18 +49,18 @@ diff -Naur xbmc-29740/configure.in xbmc-29740.patch/configure.in
 +  final_message="$final_message\n  XBMCProjectM:\tNo"
 +fi
 +
- if test "$use_pcre" = "yes"; then
-   final_message="$final_message\n  PCRE Support:\tYes"
- else
-@@ -1181,6 +1204,7 @@
+ if test "$use_mid" = "yes"; then
+   final_message="$final_message\n  MID Support:\tYes"
+   SDL_DEFINES="$SDL_DEFINES -DMID"
+@@ -1245,6 +1268,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_LIBDTS)
-@@ -1535,7 +1559,7 @@
+ AC_SUBST(USE_EXTERNAL_LIBASS)
+@@ -1626,7 +1650,7 @@
        -DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" .
  set +x
    fi
@@ -69,9 +69,9 @@ diff -Naur xbmc-29740/configure.in xbmc-29740.patch/configure.in
  
  XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
    if test "$host_vendor" != "apple" ; then
-diff -Naur xbmc-29740/Makefile.in xbmc-29740.patch/Makefile.in
---- xbmc-29740/Makefile.in	2010-05-03 03:25:29.000000000 +0200
-+++ xbmc-29740.patch/Makefile.in	2010-05-03 04:04:11.589130864 +0200
+diff -Naur xbmc-30122/Makefile.in xbmc-30122.patch/Makefile.in
+--- xbmc-30122/Makefile.in	2010-05-13 13:16:42.000000000 +0200
++++ xbmc-30122.patch/Makefile.in	2010-05-13 13:41:15.585324083 +0200
 @@ -106,8 +106,10 @@
  
  VIS_DIRS=\
@@ -85,7 +85,7 @@ diff -Naur xbmc-29740/Makefile.in xbmc-29740.patch/Makefile.in
  ifeq ($(findstring osx,$(ARCH)), osx)
  VIS_DIRS+=xbmc/visualizations/iTunes
  endif
-@@ -306,7 +308,9 @@
+@@ -307,7 +309,9 @@
  visualizations: exports
  	$(MAKE) -C xbmc/visualizations/OpenGLSpectrum
  	$(MAKE) -C xbmc/visualizations/WaveForm
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 612ee758bd..2a11112489 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-29740/configure.in xbmc-29740.patch/configure.in
---- xbmc-29740/configure.in	2010-05-03 04:06:14.609255790 +0200
-+++ xbmc-29740.patch/configure.in	2010-05-03 04:07:44.163129774 +0200
+diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in
+--- xbmc-30122/configure.in	2010-05-13 13:44:56.876227997 +0200
++++ xbmc-30122.patch/configure.in	2010-05-13 13:47:12.173197721 +0200
 @@ -25,6 +25,8 @@
  goom_disabled="== GOOM disabled. =="
  xbmcprojectm_enabled="== XBMCProjectM enabled. =="
@@ -10,7 +10,7 @@ diff -Naur xbmc-29740/configure.in xbmc-29740.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. =="
-@@ -176,6 +178,12 @@
+@@ -178,6 +180,12 @@
              [use_xbmcprojectm=$enableval],
              [use_xbmcprojectm=yes])
  
@@ -20,10 +20,10 @@ diff -Naur xbmc-29740/configure.in xbmc-29740.patch/configure.in
 +            [use_rsxs=$enableval],
 +            [use_rsxs=yes])
 +
- AC_PATH_PROG(CCACHE,ccache,none)
  AC_ARG_ENABLE([ccache],
              [AS_HELP_STRING([--enable-ccache],
-@@ -596,6 +604,15 @@
+                [enable building with ccache feature (default is auto)])],
+@@ -625,6 +633,15 @@
    BUILD_XBMCPROJECTM=1
  fi
  
@@ -39,7 +39,7 @@ diff -Naur xbmc-29740/configure.in xbmc-29740.patch/configure.in
  ### External libraries checks
  # External FFmpeg
  if test "$use_external_ffmpeg" = "yes"; then
-@@ -966,6 +983,12 @@
+@@ -1015,6 +1032,12 @@
    final_message="$final_message\n  XBMCProjectM:\tNo"
  fi
  
@@ -49,18 +49,18 @@ diff -Naur xbmc-29740/configure.in xbmc-29740.patch/configure.in
 +  final_message="$final_message\n  RSXS:\t\tNo"
 +fi
 +
- if test "$use_pcre" = "yes"; then
-   final_message="$final_message\n  PCRE Support:\tYes"
- else
-@@ -1205,6 +1228,7 @@
+ if test "$use_mid" = "yes"; then
+   final_message="$final_message\n  MID Support:\tYes"
+   SDL_DEFINES="$SDL_DEFINES -DMID"
+@@ -1269,6 +1292,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_LIBDTS)
-@@ -1613,7 +1637,7 @@
+ AC_SUBST(USE_EXTERNAL_LIBASS)
+@@ -1704,7 +1728,7 @@
        --disable-lattice \
        --disable-skyrocket
    fi
@@ -69,9 +69,9 @@ diff -Naur xbmc-29740/configure.in xbmc-29740.patch/configure.in
  
  XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
    if test "$host_vendor" = "apple" ; then
-diff -Naur xbmc-29740/Makefile.in xbmc-29740.patch/Makefile.in
---- xbmc-29740/Makefile.in	2010-05-03 04:06:14.610256210 +0200
-+++ xbmc-29740.patch/Makefile.in	2010-05-03 04:07:08.523256011 +0200
+diff -Naur xbmc-30122/Makefile.in xbmc-30122.patch/Makefile.in
+--- xbmc-30122/Makefile.in	2010-05-13 13:44:56.877229584 +0200
++++ xbmc-30122.patch/Makefile.in	2010-05-13 13:45:16.444196472 +0200
 @@ -101,8 +101,10 @@
  	lib/xbmc-dll-symbols \
  	lib/jsoncpp/jsoncpp/src/lib_json
@@ -85,7 +85,7 @@ diff -Naur xbmc-29740/Makefile.in xbmc-29740.patch/Makefile.in
  
  VIS_DIRS=\
  	xbmc/visualizations/OpenGLSpectrum \
-@@ -320,7 +322,9 @@
+@@ -321,7 +323,9 @@
  endif
  endif
  screensavers: exports
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 1a53026028..4b2a890d26 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,18 +1,18 @@
-diff -Naur xbmc-29931/configure.in xbmc-29931.patch/configure.in
---- xbmc-29931/configure.in	2010-05-08 22:08:33.000000000 +0200
-+++ xbmc-29931.patch/configure.in	2010-05-10 07:37:16.106645896 +0200
-@@ -52,6 +52,8 @@
+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 @@
+ external_liba52_disabled="== Use of external liba52 disabled. =="
+ external_libdts_enabled="== Use of external libdts enabled. =="
  external_libdts_disabled="== Use of external libdts disabled. =="
- external_libass_enabled="== Use of external libass enabled. =="
- external_libass_disabled="== Use of external libass disabled. =="
 +external_libz_enabled="== Use of external libz enabled. =="
 +external_libz_disabled="== Use of external libz disabled. =="
  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. =="
-@@ -260,6 +262,12 @@
-             [use_external_libass=$enableval],
-             [use_external_libass=$use_external_libraries])
+@@ -282,6 +284,12 @@
+             [use_external_libdts=$enableval],
+             [use_external_libdts=$use_external_libraries])
  
 +AC_ARG_ENABLE([external-libz],
 +            [AS_HELP_STRING([--enable-external-libz],
@@ -23,8 +23,8 @@ diff -Naur xbmc-29931/configure.in xbmc-29931.patch/configure.in
  AC_ARG_ENABLE([external-python],
              [AS_HELP_STRING([--enable-external-python],
              [enable use of external python library (default is no) 'Linux only'])],
-@@ -668,6 +676,18 @@
-   USE_EXTERNAL_LIBASS=0
+@@ -721,6 +729,18 @@
+   USE_EXTERNAL_LIBDTS=0
  fi
  
 +# External libz
@@ -42,9 +42,9 @@ diff -Naur xbmc-29931/configure.in xbmc-29931.patch/configure.in
  # External Python
  if test "$use_external_python" = "yes"; then
    AC_CHECK_LIB([python2.6], [main],
-@@ -1096,6 +1116,11 @@
- else
-   final_message="$final_message\n  External libass:\tNo"
+@@ -1195,6 +1215,11 @@
+     final_message="$final_message\n  External libdts:\tNo"
+   fi
  fi
 +if test "$use_external_libz" = "yes"; then
 +  final_message="$final_message\n  External zlib:\tYes"
@@ -54,12 +54,12 @@ diff -Naur xbmc-29931/configure.in xbmc-29931.patch/configure.in
  if test "$use_external_python" = "yes"; then
    final_message="$final_message\n  External Python:\tYes"
  else
-@@ -1489,7 +1514,7 @@
+@@ -1627,7 +1652,7 @@
      CFLAGS="-fPIC -fno-common -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \
      ./configure
    fi
 -], [0])
 +], [$USE_EXTERNAL_LIBZ])
  
- XB_CONFIG_MODULE([xbmc/lib/libass], [
+ XB_CONFIG_MODULE([lib/libass], [
    if test "$host_vendor" = "apple" ; then
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 d7edd6f8db..9622caa66b 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-28910/configure.in xbmc-28910.patch/configure.in
---- xbmc-28910/configure.in	2010-03-28 19:09:49.355628909 +0200
-+++ xbmc-28910.patch/configure.in	2010-03-28 19:08:34.601754086 +0200
-@@ -921,12 +921,6 @@
+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 @@
    final_message="$final_message\n  MID Support:\tNo"
  fi
  
@@ -11,13 +11,12 @@ diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
 -  INCLUDES="$INCLUDES"
 -fi
 -
- if test "$use_ccache" = "yes"; then
+ if test "x$use_ccache" != "xno"; then
+   AC_PATH_PROG(CCACHE,ccache,none)
    if test "$ac_cv_path_CCACHE" = "none"; then
-      echo "ccache not found. Falling back to default CC"
-diff -Naur xbmc-28910/configure.in.orig xbmc-28910.patch/configure.in.orig
-diff -Naur xbmc-28910/tools/TexturePacker/XBMCTex.cpp xbmc-28910.patch/tools/TexturePacker/XBMCTex.cpp
---- xbmc-28910/tools/TexturePacker/XBMCTex.cpp	2010-03-28 17:16:22.000000000 +0200
-+++ xbmc-28910.patch/tools/TexturePacker/XBMCTex.cpp	2010-03-28 19:08:34.602753740 +0200
+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
 @@ -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 f745b5daa9..22087fc01b 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,13 +1,13 @@
-diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in
---- xbmc-28910/configure.in	2010-03-28 19:12:51.211753728 +0200
-+++ xbmc-28910.patch/configure.in	2010-03-28 19:24:46.921753713 +0200
-@@ -463,9 +463,6 @@
+diff -Naur xbmc-30122/configure.in xbmc-30122.patch/configure.in
+--- xbmc-30122/configure.in	2010-05-13 13:58:23.276198942 +0200
++++ xbmc-30122.patch/configure.in	2010-05-13 13:58:49.323198531 +0200
+@@ -489,9 +489,6 @@
    PKG_CHECK_MODULES([XMU],          [xmu],
-                     [INCLUDES+=" $XMU_CFLAGS"; LIBS+=" $XMU_LIBS"],
+                     [INCLUDES="$INCLUDES $XMU_CFLAGS"; LIBS="$LIBS $XMU_LIBS"],
                      AC_MSG_ERROR($missing_library))
 -  PKG_CHECK_MODULES([XINERAMA],     [xinerama],
--                    [INCLUDES+=" $XINERAMA_CFLAGS"; LIBS+=" $XINERAMA_LIBS"],
+-                    [INCLUDES="$INCLUDES $XINERAMA_CFLAGS"; LIBS="$LIBS $XINERAMA_LIBS"],
 -                    AC_MSG_ERROR($missing_library))
    PKG_CHECK_MODULES([CURL],         [libcurl],
-                     [INCLUDES+=" $CURL_CFLAGS"; LIBS+=" $CURL_LIBS"],
+                     [INCLUDES="$INCLUDES $CURL_CFLAGS"; LIBS="$LIBS $CURL_LIBS"],
                      AC_MSG_ERROR($missing_library))
diff --git a/packages/mediacenter/xbmc/url b/packages/mediacenter/xbmc/url
index 8af9012df3..9e21a82837 100644
--- a/packages/mediacenter/xbmc/url
+++ b/packages/mediacenter/xbmc/url
@@ -1 +1 @@
-http://sources.openelec.tv/svn/xbmc-30015.tar.bz2
+http://sources.openelec.tv/svn/xbmc-30122.tar.bz2