diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta
index 37a944e953..77bdd4fba4 100644
--- a/packages/mediacenter/xbmc-theme-Confluence/meta
+++ b/packages/mediacenter/xbmc-theme-Confluence/meta
@@ -21,7 +21,7 @@
 PKG_NAME="xbmc-theme-Confluence"
 PKG_VERSION="12.2.0"
 if [ "$XBMC" = "master" ]; then
-  PKG_VERSION="57f529b"
+  PKG_VERSION="6aa6247"
 elif [ "$XBMC" = "xbmc-aml" ]; then
   PKG_VERSION="aml-frodo-d9119f2"
 fi
diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta
index 604b0c61d0..5c08ada228 100644
--- a/packages/mediacenter/xbmc/meta
+++ b/packages/mediacenter/xbmc/meta
@@ -21,7 +21,7 @@
 PKG_NAME="xbmc"
 PKG_VERSION="12.2.0"
 if [ "$XBMC" = "master" ]; then
-  PKG_VERSION="57f529b"
+  PKG_VERSION="6aa6247"
 elif [ "$XBMC" = "xbmc-aml" ]; then
   PKG_VERSION="aml-frodo-d9119f2"
 fi
diff --git a/packages/mediacenter/xbmc/patches/57f529b/xbmc-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc/patches/6aa6247/xbmc-321-texturepacker-hostflags-and-rework.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/57f529b/xbmc-321-texturepacker-hostflags-and-rework.patch
rename to packages/mediacenter/xbmc/patches/6aa6247/xbmc-321-texturepacker-hostflags-and-rework.patch
diff --git a/packages/mediacenter/xbmc/patches/57f529b/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc/patches/6aa6247/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/57f529b/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
rename to packages/mediacenter/xbmc/patches/6aa6247/xbmc-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/57f529b/xbmc-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc/patches/6aa6247/xbmc-453-add_openelec.tv_RSS_news-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/57f529b/xbmc-453-add_openelec.tv_RSS_news-0.1.patch
rename to packages/mediacenter/xbmc/patches/6aa6247/xbmc-453-add_openelec.tv_RSS_news-0.1.patch
diff --git a/packages/mediacenter/xbmc/patches/57f529b/xbmc-602-add_as.xml_busy_dialog_delay_control.patch b/packages/mediacenter/xbmc/patches/6aa6247/xbmc-602-add_as.xml_busy_dialog_delay_control.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/57f529b/xbmc-602-add_as.xml_busy_dialog_delay_control.patch
rename to packages/mediacenter/xbmc/patches/6aa6247/xbmc-602-add_as.xml_busy_dialog_delay_control.patch
diff --git a/packages/mediacenter/xbmc/patches/57f529b/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch b/packages/mediacenter/xbmc/patches/6aa6247/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/57f529b/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch
rename to packages/mediacenter/xbmc/patches/6aa6247/xbmc-990.15-depends-mark_our_wrapped_functions_as_used.patch
diff --git a/packages/mediacenter/xbmc/patches/57f529b/xbmc-995.01-xvba_support-a284bab.patch b/packages/mediacenter/xbmc/patches/6aa6247/xbmc-995.01-xvba_support-a284bab.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/57f529b/xbmc-995.01-xvba_support-a284bab.patch
rename to packages/mediacenter/xbmc/patches/6aa6247/xbmc-995.01-xvba_support-a284bab.patch
diff --git a/packages/mediacenter/xbmc/patches/57f529b/xbmc-995.10-disable-alt-tab.patch b/packages/mediacenter/xbmc/patches/6aa6247/xbmc-995.10-disable-alt-tab.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/57f529b/xbmc-995.10-disable-alt-tab.patch
rename to packages/mediacenter/xbmc/patches/6aa6247/xbmc-995.10-disable-alt-tab.patch
diff --git a/packages/mediacenter/xbmc/patches/6aa6247/xbmc-995.20-segfault_fix.patch b/packages/mediacenter/xbmc/patches/6aa6247/xbmc-995.20-segfault_fix.patch
new file mode 100644
index 0000000000..60f3dd4b6a
--- /dev/null
+++ b/packages/mediacenter/xbmc/patches/6aa6247/xbmc-995.20-segfault_fix.patch
@@ -0,0 +1,29 @@
+From 7dcf55c9560172db7e9daee2c20413cd8c9549dd Mon Sep 17 00:00:00 2001
+From: xbmc <fernetmenta@online.de>
+Date: Sun, 16 Jun 2013 13:23:19 +0200
+Subject: [PATCH] renderer: delete fence on uninit
+
+---
+ xbmc/cores/VideoRenderers/LinuxRendererGL.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
+index c663423..858d39d 100644
+--- a/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
++++ b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
+@@ -1164,7 +1164,12 @@ void CLinuxRendererGL::UnInit()
+ 
+   // YV12 textures
+   for (int i = 0; i < NUM_BUFFERS; ++i)
++  {
+     (this->*m_textureDelete)(i);
++    if (m_buffers[i].fence)
++      glDeleteSync(m_buffers[i].fence);
++    m_buffers[i].fence = None;
++  }
+ 
+   // cleanup framebuffer object if it was in use
+   m_fbo.fbo.Cleanup();
+-- 
+1.8.1.6
+
diff --git a/packages/mediacenter/xbmc/patches/57f529b/xbmc-999.01-automake-1.13.patch b/packages/mediacenter/xbmc/patches/6aa6247/xbmc-999.01-automake-1.13.patch
similarity index 100%
rename from packages/mediacenter/xbmc/patches/57f529b/xbmc-999.01-automake-1.13.patch
rename to packages/mediacenter/xbmc/patches/6aa6247/xbmc-999.01-automake-1.13.patch