diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index 4a35870966..2b4a910198 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -74,6 +74,7 @@ if [ "$AFP_SUPPORT" = yes ]; then
   XBMC_AFP="--enable-afpclient"
 else
   XBMC_AFP="--disable-afpclient"
+fi
 
 if [ "$SAMBA_CLIENT" = yes ]; then
   XBMC_SAMBA="--enable-samba"
@@ -198,16 +199,10 @@ cd $PKG_BUILD
             $XBMC_NONFREE \
             --disable-asap-codec \
             $XBMC_WEBSERVER \
-<<<<<<< HEAD
             --enable-optical-drive \
-            --enable-libbluray \
+            $XBMC_BLURAY \
             --enable-texturepacker \
             --disable-external-libraries \
-=======
-            --disable-libdts \
-            --disable-liba52 \
-            $XBMC_BLURAY \
->>>>>>> 8c05f3c4f8219cd1d7543041e180d64933df95fd
             --disable-external-ffmpeg \
 
 # setup default skin inside the sources
diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta
index 4d736b5ac8..7bf3a47151 100644
--- a/packages/mediacenter/xbmc/meta
+++ b/packages/mediacenter/xbmc/meta
@@ -25,8 +25,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.xbmc.org"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack lame libmpeg2 SDL SDL_mixer SDL_image sqlite mysql alsa bc xbmc-addon-settings"
-PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack lame libmpeg2 SDL SDL_mixer SDL_image sqlite mysql"
+PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump libplist Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql alsa bc xbmc-addon-settings"
+PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump libplist Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"
 PKG_SHORTDESC="xbmc: XBMC Mediacenter"
@@ -75,6 +75,7 @@ fi
 if [ "$AFP_SUPPORT" = yes ]; then
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS afpfs-ng"
   PKG_DEPENDS="$PKG_DEPENDS afpfs-ng"
+fi
 
 if [ "$SAMBA_CLIENT" = yes ]; then
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS samba"
@@ -113,3 +114,4 @@ fi
 # some python stuff needed for various addons
   PKG_DEPENDS="$PKG_DEPENDS Imaging"
   PKG_DEPENDS="$PKG_DEPENDS simplejson"
+