diff --git a/xbmc/PKGBUILD b/xbmc/PKGBUILD
index b8eac584c..274d5319b 100644
--- a/xbmc/PKGBUILD
+++ b/xbmc/PKGBUILD
@@ -10,7 +10,7 @@ _prefix=/usr
 
 pkgname=xbmc
 pkgver=10.1
-pkgrel=1
+pkgrel=8
 pkgdesc="XBMC Media Center"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
@@ -20,31 +20,35 @@ depends=( 'bzip2' 'curl' 'enca' 'faac' 'faad2' 'fontconfig' 'fribidi'
 	  'libmpeg2' 'libmysqlclient' 'libsamplerate' 'libxinerama'
 	  'libxrandr' 'libxtst' 'lzo2' 'sdl_image' 'sdl_mixer'
 	  'smbclient' 'wavpack' 'mesa-demos' 'xorg-utils' 'libmicrohttpd'
-	  'libssh' 'libva' 'libmodplug' 'rtmpdump' 'lsb-release')
+	  'libssh' 'libva' 'libmodplug' 'rtmpdump' 'lsb-release' 'sqlite3')
 if [ "$_ext_python" != "disable" ]; then
   depends=( '${depends[@]}' 'python2' )
 fi
 makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libvdpau' 'unzip' 'zip' 'cvs')
 optdepends=('lirc: remote controller support'
 	    'unrar: access compressed files without unpacking them'
-	    'devicekit-power: used to trigger suspend functionality'
 	    'udisks: automount external drives'
 	    'upower: used to trigger suspend functionality'
 	    'libvdpau: for nvidia hardware acceleration'
 	    'lcms'
 	    'tk')
 install=("${pkgname}.install")
-options=(makeflags sign)
+options=(makeflags)
 source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
-	"http://chakra-project.org/sources/xbmc/xbmc-10.1-skin.confluence-Textures.xbt"
-        "FEH.sh")
+	"FEH.sh"
+        xbmc-10.1-gcc-4.6.patch
+	http://trac.xbmc.org/raw-attachment/ticket/11584/xbmcplugin_int_format.patch)
 md5sums=('391398126cb86a4f6fbd0b7037997d84'
-         '238f26501bd1e0c73ebb3050a48131f2'
-         'c3e2ab79b9965f1a4a048275d5f222c4')
+         'c3e2ab79b9965f1a4a048275d5f222c4'
+         '16479d228f81cca4dc32146f1efc1838'
+         'f42aa74a982ca854491a74e960f13804')
 
 build() {
     cd "${srcdir}/xbmc-$pkgver"
 
+    patch -p1 <$srcdir/xbmc-10.1-gcc-4.6.patch
+   (cd xbmc/lib/libPython/xbmcmodule && patch -p5 <$srcdir/xbmcplugin_int_format.patch)
+
     pacman -Q libass && { msg "Remove libass"; return 1; }
 
     # remove "--as-needed" from LDFLAGS
@@ -67,17 +71,9 @@ build() {
 	--disable-external-libass \
 	--disable-external-ffmpeg \
 	--enable-rtmp \
-	--${_ext_python}-external-python \
+	--disable-external-python \
 	--disable-debug
 
-    # Fix textures bug in i686
-    if [ "${CARCH}" = "i686" ]; then
-        msg "Fixing Textures.xbt in i686"
-        cp -v ${srcdir}/xbmc-10.1-skin.confluence-Textures.xbt ${srcdir}/xbmc-${pkgver}/addons/skin.confluence/media/Textures.xbt
-        sed -i -e 's~$(MAKE) -C $(CONFLUENCE_MEDIA)~echo "SKIPPING Textures.xbt"~g' ${srcdir}/xbmc-${pkgver}/Makefile.in
-        sed -i -e 's~$(MAKE) -C $(CONFLUENCE_MEDIA)~echo "SKIPPING Textures.xbt"~g' ${srcdir}/xbmc-${pkgver}/Makefile
-    fi
-
     # Now (finally) build
     msg "Running make"
     make ${MAKEFLAGS}
@@ -121,7 +117,4 @@ package() {
     rm -f "${pkgdir}/usr/share/xbmc/FEH.py"
     rm -f "${pkgdir}/usr/share/icons/hicolor/icon-theme.cache"
 
-    # strip
-    msg "Stripping binaries"
-    find "$pkgdir" -type f -exec strip {} \; >/dev/null 2>/dev/null
 }
diff --git a/xbmc/xbmc.install b/xbmc/xbmc.install
index 5d12f3791..1a9e752a0 100644
--- a/xbmc/xbmc.install
+++ b/xbmc/xbmc.install
@@ -1,29 +1,16 @@
 post_install() {
-  echo ">> If XBMC won't start, but just segfaults, double check your X.Org config."
-  echo ">> The display depth has to be at least 24-bit, ie"
-  echo ">> set \"DefaultDepth 24\" under the \"Screen\" section of your xorg.conf file."
-  echo ">> If you have problems or suggestions for this PKGBUILD, have a look at its"
-  echo ">> dedicated forum thread: http://bbs.archlinux.org/viewtopic.php?pid=559107"
-  echo ">> or the wiki: http://xbmc.org/wiki/?title=XBMC_on_Arch_Linux_(Unofficial)."
-  echo ">> Note that this is a development version of XBMC." 
-  echo ">> If you encounter problems with XBMC don't forget to consult the official"
-  echo ">> xbmc forums found here: http://forum.xbmc.org "
-  echo ">> and report bugs to the xbmc bugtracker found here: http://trac.xbmc.org."
-  echo
-
   [[ $(type -p gtk-update-icon-cache) ]] && /usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
   [[ $(type -p update-desktop-database) ]] && /usr/bin/update-desktop-database -q usr/share/applications
   /bin/true
 }
 
 post_upgrade() {
-  [[ $(type -p gtk-update-icon-cache) ]] && /usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
-  [[ $(type -p update-desktop-database) ]] && /usr/bin/update-desktop-database -q usr/share/applications
+  post_install $1
   /bin/true
 }
 
 post_remove() {
-  [[ $(type -p gtk-update-icon-cache) ]] && /usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
-  [[ $(type -p update-desktop-database) ]] && /usr/bin/update-desktop-database -q usr/share/applications
+  post_install $1
   /bin/true
 }
+