diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta
index 6dfaad2cea..2d401b39e1 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="30a9070"
+PKG_VERSION="a8d22f6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta
index 97a0d544f6..822d04c23a 100644
--- a/packages/mediacenter/xbmc/meta
+++ b/packages/mediacenter/xbmc/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="30a9070"
+PKG_VERSION="a8d22f6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/xbmc/patches/xbmc-30a9070-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-a8d22f6-001-add_support_to_specify_GIT_REV-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-30a9070-001-add_support_to_specify_GIT_REV-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-a8d22f6-001-add_support_to_specify_GIT_REV-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-30a9070-013-reenable_lcd_config_settings-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-a8d22f6-013-reenable_lcd_config_settings-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-30a9070-013-reenable_lcd_config_settings-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-a8d22f6-013-reenable_lcd_config_settings-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-30a9070-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-a8d22f6-201-let_select_XBMCProjectM-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-30a9070-201-let_select_XBMCProjectM-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-a8d22f6-201-let_select_XBMCProjectM-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-30a9070-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-a8d22f6-202-let_select_RSXS-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-30a9070-202-let_select_RSXS-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-a8d22f6-202-let_select_RSXS-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-30a9070-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-a8d22f6-303-fix_libdvd_xFLAGS-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-30a9070-303-fix_libdvd_xFLAGS-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-a8d22f6-303-fix_libdvd_xFLAGS-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-30a9070-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-a8d22f6-402-enable_yasm_in_ffmpeg-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-30a9070-402-enable_yasm_in_ffmpeg-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-a8d22f6-402-enable_yasm_in_ffmpeg-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-30a9070-404-add_lame_check-0.6.patch b/packages/mediacenter/xbmc/patches/xbmc-a8d22f6-404-add_lame_check-0.6.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-30a9070-404-add_lame_check-0.6.patch
rename to packages/mediacenter/xbmc/patches/xbmc-a8d22f6-404-add_lame_check-0.6.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-30a9070-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-a8d22f6-452-change_lcd_content-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-30a9070-452-change_lcd_content-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-a8d22f6-452-change_lcd_content-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-30a9070-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-a8d22f6-453-add_openelec.tv_RSS_news-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-30a9070-453-add_openelec.tv_RSS_news-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-a8d22f6-453-add_openelec.tv_RSS_news-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-30a9070-453-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-a8d22f6-453-ps3_remote_be_more_quiet-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-30a9070-453-ps3_remote_be_more_quiet-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-a8d22f6-453-ps3_remote_be_more_quiet-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-30a9070-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-a8d22f6-454-disable_backslash-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-30a9070-454-disable_backslash-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-a8d22f6-454-disable_backslash-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-30a9070-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-a8d22f6-462-add_remote_irtrans_mediacenter-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-30a9070-462-add_remote_irtrans_mediacenter-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-a8d22f6-462-add_remote_irtrans_mediacenter-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-30a9070-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-a8d22f6-463-add_remote_devinput-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-30a9070-463-add_remote_devinput-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-a8d22f6-463-add_remote_devinput-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-30a9070-464-add_eject_keymapping_for_lirc-0.1.patch b/packages/mediacenter/xbmc/patches/xbmc-a8d22f6-464-add_eject_keymapping_for_lirc-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/xbmc-30a9070-464-add_eject_keymapping_for_lirc-0.1.patch
rename to packages/mediacenter/xbmc/patches/xbmc-a8d22f6-464-add_eject_keymapping_for_lirc-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/xbmc-30a9070-901-advancedsettings_alwaysextractflags.patch b/packages/mediacenter/xbmc/patches/xbmc-a8d22f6-901-advancedsettings_alwaysextractflags.patch
similarity index 58%
rename from packages/mediacenter/xbmc/patches/xbmc-30a9070-901-advancedsettings_alwaysextractflags.patch
rename to packages/mediacenter/xbmc/patches/xbmc-a8d22f6-901-advancedsettings_alwaysextractflags.patch
index 126207b081..336d778455 100644
--- a/packages/mediacenter/xbmc/patches/xbmc-30a9070-901-advancedsettings_alwaysextractflags.patch
+++ b/packages/mediacenter/xbmc/patches/xbmc-a8d22f6-901-advancedsettings_alwaysextractflags.patch
@@ -1,17 +1,17 @@
-diff -Naur xbmc-pvr-3513480/xbmc/settings/GUISettings.cpp xbmc-pvr-3513480.patch/xbmc/settings/GUISettings.cpp
---- xbmc-pvr-3513480/xbmc/settings/GUISettings.cpp	2011-04-25 02:36:33.000000000 +0200
-+++ xbmc-pvr-3513480.patch/xbmc/settings/GUISettings.cpp	2011-04-25 05:34:56.319686149 +0200
-@@ -651,6 +651,7 @@
+diff -Naur xbmc-a8d22f6/xbmc/settings/GUISettings.cpp xbmc-a8d22f6.patch/xbmc/settings/GUISettings.cpp
+--- xbmc-a8d22f6/xbmc/settings/GUISettings.cpp	2011-08-02 15:01:17.000000000 +0200
++++ xbmc-a8d22f6.patch/xbmc/settings/GUISettings.cpp	2011-08-02 15:25:47.205925050 +0200
+@@ -654,6 +654,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);
 +  AddBool(vid, "myvideos.alwaysextractflags",20433, false);
-   AddBool(vid, "myvideos.cleanstrings", 20418, false);
+   AddBool(vid, "myvideos.filemetadata", 20419, true);
    AddBool(NULL, "myvideos.extractthumb",20433, true);
  
-diff -Naur xbmc-pvr-3513480/xbmc/ThumbLoader.cpp xbmc-pvr-3513480.patch/xbmc/ThumbLoader.cpp
---- xbmc-pvr-3513480/xbmc/ThumbLoader.cpp	2011-04-25 02:36:33.000000000 +0200
-+++ xbmc-pvr-3513480.patch/xbmc/ThumbLoader.cpp	2011-04-25 05:34:56.320686130 +0200
+diff -Naur xbmc-a8d22f6/xbmc/ThumbLoader.cpp xbmc-a8d22f6.patch/xbmc/ThumbLoader.cpp
+--- xbmc-a8d22f6/xbmc/ThumbLoader.cpp	2011-08-02 15:01:19.000000000 +0200
++++ xbmc-a8d22f6.patch/xbmc/ThumbLoader.cpp	2011-08-02 15:24:54.831265675 +0200
 @@ -146,7 +146,7 @@
        m_item.SetThumbnailImage(m_target);
      }