diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta
index b1738abc8e..32d57e9d3d 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="12.0.2"
+PKG_VERSION="12.0.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/xbmc/init.d/93_xbmc b/packages/mediacenter/xbmc/init.d/93_xbmc
index fa4606486f..ed0d4f6020 100644
--- a/packages/mediacenter/xbmc/init.d/93_xbmc
+++ b/packages/mediacenter/xbmc/init.d/93_xbmc
@@ -55,7 +55,7 @@ fi
 # wait for network
   wait_for_inet_addr
 
-# set cpu's to 'conservative'
+# set cpu's to 'ondemand'
   ( usleep 15000000
     progress "set cpu's to 'ondemand'"
     cpupower frequency-set -g ondemand > /dev/null 2>&1
diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta
index 321e843e2b..02fd03da7e 100644
--- a/packages/mediacenter/xbmc/meta
+++ b/packages/mediacenter/xbmc/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="12.0.2"
+PKG_VERSION="12.0.3"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/xbmc/patches/xbmc-990.01-bump_xbmc_addon_version.patch b/packages/mediacenter/xbmc/patches/xbmc-990.01-bump_xbmc_addon_version.patch
deleted file mode 100644
index 21407ac94d..0000000000
--- a/packages/mediacenter/xbmc/patches/xbmc-990.01-bump_xbmc_addon_version.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 65a8eb83549ef092f6f192c944befa6f762c885d Mon Sep 17 00:00:00 2001
-From: ronie <ronie@poedel.net>
-Date: Sat, 23 Feb 2013 17:40:04 +0100
-Subject: [PATCH] bump xbmc.addon to 12.1.0
-
----
- addons/xbmc.addon/addon.xml |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/addons/xbmc.addon/addon.xml b/addons/xbmc.addon/addon.xml
-index db32072..7d38949 100644
---- a/addons/xbmc.addon/addon.xml
-+++ b/addons/xbmc.addon/addon.xml
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="UTF-8"?>
--<addon id="xbmc.addon" version="12.0.0" provider-name="Team XBMC">
-+<addon id="xbmc.addon" version="12.1.0" provider-name="Team XBMC">
-   <backwards-compatibility abi="12.0"/>
-   <requires>
-     <import addon="xbmc.core" version="0.1.0"/>
--- 
-1.7.10
-
diff --git a/packages/mediacenter/xbmc/patches/xbmc-991.15-ae-fix-segfault.patch b/packages/mediacenter/xbmc/patches/xbmc-991.15-ae-fix-segfault.patch
deleted file mode 100644
index c18991e6b8..0000000000
--- a/packages/mediacenter/xbmc/patches/xbmc-991.15-ae-fix-segfault.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From dc648b78c4c571cc0a5d3df3e7b64c21c7d0901e Mon Sep 17 00:00:00 2001
-From: fritsch <peter.fruehberger@gmail.com>
-Date: Sat, 23 Feb 2013 10:44:33 +0100
-Subject: [PATCH] AE: fix segfault after indirection patches
-
----
- xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp |    8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
-index cfb7be5..6ec78c5 100644
---- a/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
-+++ b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
-@@ -728,7 +728,6 @@ void CSoftAE::PauseStream(CSoftAEStream *stream)
-   CSingleLock streamLock(m_streamLock);
-   RemoveStream(m_playingStreams, stream);
-   stream->m_paused = true;
--  streamLock.Leave();
- 
-   m_reOpen = true;
-   m_wake.Set();
-@@ -874,7 +873,10 @@ IAEStream *CSoftAE::FreeStream(IAEStream *stream)
-   RemoveStream(m_streams       , (CSoftAEStream*)stream);
-   // Reopen is old behaviour. Not opening when masterstream stops means clipping on S/PDIF.
-   if(!m_isSuspended && (m_masterStream == stream))
-+  {
-     m_reOpen = true;
-+    m_masterStream = NULL;
-+  }
- 
-   delete (CSoftAEStream*)stream;
-   return NULL;
-@@ -1058,11 +1060,11 @@ void CSoftAE::Run()
-     bool restart = false;
- 
-     /* with the new non blocking implementation - we just reOpen here, when it tells reOpen */
--    if (!m_reOpen && (this->*m_outputStageFn)(hasAudio) > 0)
-+    if ((this->*m_outputStageFn)(hasAudio) > 0)
-       hasAudio = false; /* taken some audio - reset our silence flag */
- 
-     /* if we have enough room in the buffer */
--    if (!m_reOpen && m_buffer.Free() >= m_frameSize)
-+    if (m_buffer.Free() >= m_frameSize)
-     {
-       /* take some data for our use from the buffer */
-       uint8_t *out = (uint8_t*)m_buffer.Take(m_frameSize);
--- 
-1.7.10
diff --git a/packages/mediacenter/xbmc/patches/xbmc-995.10-xvba_rpi_fixes-059b89b.patch b/packages/mediacenter/xbmc/patches/xbmc-995.10-xvba_rpi_fixes-059b89b.patch
index a93becfe17..7f5a4136ab 100644
--- a/packages/mediacenter/xbmc/patches/xbmc-995.10-xvba_rpi_fixes-059b89b.patch
+++ b/packages/mediacenter/xbmc/patches/xbmc-995.10-xvba_rpi_fixes-059b89b.patch
@@ -861,75 +861,6 @@ index 90f94aa..ecf4c9a 100644
 1.7.10
 
 
-From 192e1b003ddbda567342c42fb20ce5c7dee28ab1 Mon Sep 17 00:00:00 2001
-From: xbmc <fernetmenta@online.de>
-Date: Thu, 21 Feb 2013 18:09:07 +0100
-Subject: [PATCH 5/7] fix ass subs for GLES
-
----
- xbmc/cores/VideoRenderers/OverlayRendererGL.cpp |   33 +++++++++++++++--------
- 1 file changed, 22 insertions(+), 11 deletions(-)
-
-diff --git a/xbmc/cores/VideoRenderers/OverlayRendererGL.cpp b/xbmc/cores/VideoRenderers/OverlayRendererGL.cpp
-index 4375d19..ed8e48d 100644
---- a/xbmc/cores/VideoRenderers/OverlayRendererGL.cpp
-+++ b/xbmc/cores/VideoRenderers/OverlayRendererGL.cpp
-@@ -359,7 +359,7 @@ static void LoadTexture(GLenum target
- 
- void COverlayGlyphGL::Render(SRenderState& state)
- {
--  if (m_texture == 0)
-+  if ((m_texture == 0) || (m_count == 0))
-     return;
- 
-   glEnable(GL_TEXTURE_2D);
-@@ -418,21 +418,32 @@ void COverlayGlyphGL::Render(SRenderState& state)
-   GLint colLoc  = g_Windowing.GUIShaderGetCol();
-   GLint tex0Loc = g_Windowing.GUIShaderGetCoord0();
- 
--  glVertexAttribPointer(posLoc,  3, GL_FLOAT,         GL_FALSE, sizeof(VERTEX), (char*)m_vertex + offsetof(VERTEX, x));
--  glVertexAttribPointer(colLoc,  4, GL_UNSIGNED_BYTE, GL_TRUE,  sizeof(VERTEX), (char*)m_vertex + offsetof(VERTEX, r));
--  glVertexAttribPointer(tex0Loc, 2, GL_FLOAT,         GL_FALSE, sizeof(VERTEX), (char*)m_vertex + offsetof(VERTEX, u));
-+  // stack object until VBOs will be used
-+  std::vector<VERTEX> vecVertices( 6 * m_count);
-+  VERTEX *vertices = &vecVertices[0];
-+
-+  for (int i=0; i<m_count*4; i+=4)
-+  {
-+    *vertices++ = m_vertex[i];
-+    *vertices++ = m_vertex[i+1];
-+    *vertices++ = m_vertex[i+2];
-+
-+    *vertices++ = m_vertex[i+1];
-+    *vertices++ = m_vertex[i+3];
-+    *vertices++ = m_vertex[i+2];
-+  }
-+
-+  vertices = &vecVertices[0];
-+
-+  glVertexAttribPointer(posLoc,  3, GL_FLOAT,         GL_FALSE, sizeof(VERTEX), (char*)vertices + offsetof(VERTEX, x));
-+  glVertexAttribPointer(colLoc,  4, GL_UNSIGNED_BYTE, GL_TRUE,  sizeof(VERTEX), (char*)vertices + offsetof(VERTEX, r));
-+  glVertexAttribPointer(tex0Loc, 2, GL_FLOAT,         GL_FALSE, sizeof(VERTEX), (char*)vertices + offsetof(VERTEX, u));
- 
-   glEnableVertexAttribArray(posLoc);
-   glEnableVertexAttribArray(colLoc);
-   glEnableVertexAttribArray(tex0Loc);
- 
--  // GLES2 version
--  // As using triangle strips, have to do in sets of 4.
--  // This is due to limitations of ES, in that tex/col has to be same size as ver!
--  for (int i=0; i<(m_count*4); i+=4)
--  {
--    glDrawArrays(GL_TRIANGLE_STRIP, i, 4);
--  }
-+  glDrawArrays(GL_TRIANGLES, 0, vecVertices.size());
- 
-   glDisableVertexAttribArray(posLoc);
-   glDisableVertexAttribArray(colLoc);
--- 
-1.7.10
-
-
 From 572031ecf662ee23af414e6961004b3cf1336644 Mon Sep 17 00:00:00 2001
 From: xbmc <fernetmenta@online.de>
 Date: Sun, 24 Feb 2013 09:55:00 +0100
diff --git a/scripts/create_addon b/scripts/create_addon
index aaa74590de..f1684250cc 100755
--- a/scripts/create_addon
+++ b/scripts/create_addon
@@ -36,7 +36,7 @@ if [ -z "$1" ]; then
   exit 1
 fi
 
-if [ -n $PKG_ARCH -a ! "$PKG_ARCH" = "any" ]; then
+if [ -n "$PKG_ARCH" -a ! "$PKG_ARCH" = "any" ]; then
   echo "$PKG_ARCH" | grep -q "$TARGET_ARCH" || exit 0
   echo "$PKG_ARCH" | grep -q "\-$TARGET_ARCH" && exit 0
 fi
diff --git a/tools/mkpkg/mkpkg_xbmc-frodo b/tools/mkpkg/mkpkg_xbmc-frodo
index 36075d4626..751289b3b4 100755
--- a/tools/mkpkg/mkpkg_xbmc-frodo
+++ b/tools/mkpkg/mkpkg_xbmc-frodo
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="12.0.2"
+PKG_VERSION="12.0.3"
 GIT_REPO="-b Frodo git://github.com/xbmc/xbmc.git"
 DEST_DIR="$PKG_NAME-frodo"