diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta
index 4e3040a75b..538b4a552c 100644
--- a/packages/mediacenter/xbmc-theme-Confluence/meta
+++ b/packages/mediacenter/xbmc-theme-Confluence/meta
@@ -19,13 +19,12 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="2e00d86"
+PKG_VERSION="aeb4dec"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.xbmc.org"
-#PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_URL="http://gujs.openelec.tv/sources/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index 319ee97904..5cb9c795e6 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -152,8 +152,6 @@ cd $PKG_BUILD
 # adding fake Makefile for stripped skin
   mkdir -p addons/skin.confluence/media
   touch addons/skin.confluence/media/Makefile.in
-  mkdir -p addons/skin.touched/media
-  touch addons/skin.touched/media/Makefile.in
 
 # autoreconf
   do_autoreconf
diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta
index 0b5b0989d4..68d5e11656 100644
--- a/packages/mediacenter/xbmc/meta
+++ b/packages/mediacenter/xbmc/meta
@@ -19,14 +19,13 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="2e00d86"
+PKG_VERSION="aeb4dec"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.xbmc.org"
-#PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_URL="http://gujs.openelec.tv/sources/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump $MESA glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql alsa bc xbmc-addon-settings xbmc-addon-xvdr "
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump $MESA glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql alsa bc xbmc-addon-settings"
 PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump $MESA glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"
diff --git a/packages/mediacenter/xbmc/patches/xbmc-2e00d86-901-vdpau_fix_deinterlacing_if_flag_toggles.patch b/packages/mediacenter/xbmc/patches/xbmc-2e00d86-901-vdpau_fix_deinterlacing_if_flag_toggles.patch
deleted file mode 100644
index 83b3ba6054..0000000000
--- a/packages/mediacenter/xbmc/patches/xbmc-2e00d86-901-vdpau_fix_deinterlacing_if_flag_toggles.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-index d4892b5..697431c 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp
-@@ -943,6 +943,7 @@ bool CVDPAU::ConfigVDPAU(AVCodecContext* avctx, int ref_frames)
- 
-   m_vdpauOutputMethod = OUTPUT_NONE;
- 
-+  m_binterlacedFrame = false;
-   return true;
- }
- 
-@@ -1203,8 +1204,14 @@ int CVDPAU::Decode(AVCodecContext *avctx, AVFrame *pFrame)
-         m_DVDVideoPics.pop();
-     }
- 
-+    if (!m_binterlacedFrame && m_DVDVideoPics.front().iFlags & DVP_FLAG_INTERLACED)
-+    {
-+      m_binterlacedFrame = m_DVDVideoPics.front().iFlags & DVP_FLAG_INTERLACED;
-+      CLog::Log(LOGNOTICE, "CVDPAU::ConfigOutputMethod: detected interlaced frame");
-+    }
-+
-     if (mode == VS_DEINTERLACEMODE_FORCE
--    || (mode == VS_DEINTERLACEMODE_AUTO && m_DVDVideoPics.front().iFlags & DVP_FLAG_INTERLACED))
-+    || (mode == VS_DEINTERLACEMODE_AUTO && m_binterlacedFrame))
-     {
-       if((method == VS_INTERLACEMETHOD_AUTO_ION
-       ||  method == VS_INTERLACEMETHOD_VDPAU_BOB
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
-index 2056de1..fc1b9d0 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h
-@@ -209,6 +209,7 @@ public:
-   uint32_t max_references;
-   Display* m_Display;
-   bool     vdpauConfigured;
-+  bool     m_binterlacedFrame;
- 
- 
-   VdpVideoMixerPictureStructure m_mixerfield;
diff --git a/packages/mediacenter/xbmc/patches/xbmc-2e00d86-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-aeb4dec-001-add_support_to_specify_GIT_REV-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-2e00d86-001-add_support_to_specify_GIT_REV-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-aeb4dec-001-add_support_to_specify_GIT_REV-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-2e00d86-013-reenable_lcd_config_settings-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-aeb4dec-013-reenable_lcd_config_settings-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-2e00d86-013-reenable_lcd_config_settings-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-aeb4dec-013-reenable_lcd_config_settings-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-2e00d86-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-aeb4dec-303-fix_libdvd_xFLAGS-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-2e00d86-303-fix_libdvd_xFLAGS-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-aeb4dec-303-fix_libdvd_xFLAGS-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-2e00d86-311-fix_rsxs_build-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-aeb4dec-311-fix_rsxs_build-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-2e00d86-311-fix_rsxs_build-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-aeb4dec-311-fix_rsxs_build-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-2e00d86-351-increase_YV12_buffers-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-aeb4dec-351-increase_YV12_buffers-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-2e00d86-351-increase_YV12_buffers-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-aeb4dec-351-increase_YV12_buffers-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-2e00d86-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-aeb4dec-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-2e00d86-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-aeb4dec-353-limit_glxSwapBuffers_going_to_far_ahead-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-2e00d86-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-aeb4dec-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-2e00d86-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-aeb4dec-354-vaapi_increase_number_of_video_surface_allocated-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-2e00d86-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-aeb4dec-402-enable_yasm_in_ffmpeg-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-2e00d86-402-enable_yasm_in_ffmpeg-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-aeb4dec-402-enable_yasm_in_ffmpeg-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-2e00d86-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc/patches/xbmc-aeb4dec-404-add_lame_check-0.6.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-2e00d86-404-add_lame_check-0.6.patch
rename to packages/mediacenter/xbmc/patches/xbmc-aeb4dec-404-add_lame_check-0.6.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-2e00d86-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-aeb4dec-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-2e00d86-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-aeb4dec-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-2e00d86-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-aeb4dec-452-change_lcd_content-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-2e00d86-452-change_lcd_content-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-aeb4dec-452-change_lcd_content-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-2e00d86-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-aeb4dec-453-add_openelec.tv_RSS_news-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-2e00d86-453-add_openelec.tv_RSS_news-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-aeb4dec-453-add_openelec.tv_RSS_news-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-2e00d86-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-aeb4dec-454-disable_backslash-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-2e00d86-454-disable_backslash-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-aeb4dec-454-disable_backslash-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-2e00d86-457-fix_connection_check-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-aeb4dec-457-fix_connection_check-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-2e00d86-457-fix_connection_check-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-aeb4dec-457-fix_connection_check-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-2e00d86-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-aeb4dec-462-add_remote_irtrans_mediacenter-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-2e00d86-462-add_remote_irtrans_mediacenter-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-aeb4dec-462-add_remote_irtrans_mediacenter-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-2e00d86-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-aeb4dec-463-add_remote_devinput-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-2e00d86-463-add_remote_devinput-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-aeb4dec-463-add_remote_devinput-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-2e00d86-464-add_eject_keymapping_for_lirc-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-aeb4dec-464-add_eject_keymapping_for_lirc-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-2e00d86-464-add_eject_keymapping_for_lirc-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-aeb4dec-464-add_eject_keymapping_for_lirc-0.1.patch