diff --git a/alarm/xbmc-rbp/PKGBUILD b/alarm/xbmc-rbp/PKGBUILD
index 9544058d5..4779aed51 100644
--- a/alarm/xbmc-rbp/PKGBUILD
+++ b/alarm/xbmc-rbp/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor WarheadsSE <max@warheads.net>
 pkgname=xbmc-rbp
 pkgver=12.1
-pkgrel=2
+pkgrel=3
 buildarch=16
 
 pkgdesc="A software media player and entertainment hub for digital media for the Raspberry Pi"
@@ -33,14 +33,24 @@ md5sums=('8955473f84cb2a0513c0f3efd7e68843'
 
 _prefix=/usr
 
-build() {
+prepare() {
   cd "${srcdir}/xbmc-${pkgver}"
 
   # fix lsb_release dependency
   sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
 
-  # Patch to fix TexturePacker build. 
-  patch -i ${srcdir}/xbmc-ae04d99-321-texturepacker-hostflags-and-rework.patch -p1 
+  # Patch to fix TexturePacker build.
+  patch -i ${srcdir}/xbmc-ae04d99-321-texturepacker-hostflags-and-rework.patch -p1
+
+  # fix samba4 libsmbclient.h location
+  sed -e 's/\(#include \)<libsmbclient\.h>/\1<samba-4.0\/libsmbclient\.h>/g' \
+    -i xbmc/filesystem/SmbFile.cpp \
+    -i xbmc/filesystem/SMBDirectory.cpp
+}
+
+
+build() {
+  cd "${srcdir}/xbmc-${pkgver}"
 
   # Bootstrapping XBMC
   ./bootstrap
diff --git a/aur/xbmc-rbp-git/PKGBUILD b/aur/xbmc-rbp-git/PKGBUILD
index 73ff6823d..782253efd 100644
--- a/aur/xbmc-rbp-git/PKGBUILD
+++ b/aur/xbmc-rbp-git/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor WarheadsSE <max@warheads.net>
 _gitname="xbmc"
 pkgname=xbmc-rbp-git
-pkgver=13.306.gcdedbd8
+pkgver=13.497.g44f0991
 #xbmc Gotham is version 13
 _cycle_version=13
 pkgver() {
@@ -47,6 +47,11 @@ prepare() {
 
   # Patch to fix TexturePacker build. 
   git apply ${srcdir}/xbmc-ae04d99-321-texturepacker-hostflags-and-rework.patch
+
+  # fix samba4 libsmbclient.h location
+  sed -e 's/\(#include \)<libsmbclient\.h>/\1<samba-4.0\/libsmbclient\.h>/g' \
+    -i xbmc/filesystem/SmbFile.cpp \
+    -i xbmc/filesystem/SMBDirectory.cpp
 }
 
 build() {