diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk
index 067c41653e..53dd8cb3d4 100644
--- a/packages/mediacenter/xbmc/package.mk
+++ b/packages/mediacenter/xbmc/package.mk
@@ -23,7 +23,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.xbmc.org"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="Python zlib bzip2 systemd ffmpeg libass curl rtmpdump fontconfig freetype libmad libogg libmodplug faad2 flac libmpeg2 taglib libxml2 service.openelec.settings"
+PKG_DEPENDS_TARGET="Python zlib bzip2 systemd ffmpeg libass curl rtmpdump fontconfig freetype libmad libogg libmodplug faad2 flac libmpeg2 taglib libxml2 service.openelec.settings"
 PKG_BUILD_DEPENDS_TARGET="toolchain boost Python zlib bzip2 systemd pciutils lzo pcre swig:host ffmpeg libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libcdio libmodplug faad2 flac libmpeg2 taglib libxml2 libxslt yajl sqlite"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"
@@ -35,27 +35,27 @@ PKG_AUTORECONF="no"
 
 # for dbus support
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET dbus"
-  PKG_DEPENDS="$PKG_DEPENDS dbus"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET dbus"
 
 # needed for hosttools (Texturepacker)
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET lzo:host SDL:host SDL_image:host"
 
 # some python stuff needed for various addons
-  PKG_DEPENDS="$PKG_DEPENDS Imaging"
-  PKG_DEPENDS="$PKG_DEPENDS simplejson"
-  PKG_DEPENDS="$PKG_DEPENDS pycrypto"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET Imaging"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET simplejson"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pycrypto"
 
 # various PVR clients
-  PKG_DEPENDS="$PKG_DEPENDS xbmc-pvr-addons"
-  PKG_DEPENDS="$PKG_DEPENDS xbmc-addon-xvdr"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xbmc-pvr-addons"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET xbmc-addon-xvdr"
 
 if [ "$DISPLAYSERVER" = "xorg-server" ]; then
 # for libX11 support
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET libX11 libXext"
-  PKG_DEPENDS="$PKG_DEPENDS libX11 libXext"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libX11 libXext"
 # for libXrandr support
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET libXrandr"
-  PKG_DEPENDS="$PKG_DEPENDS libXrandr"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libXrandr"
   XBMC_XORG="--enable-x11 --enable-xrandr"
 else
   XBMC_XORG="--disable-x11 --disable-xrandr"
@@ -64,7 +64,7 @@ fi
 if [ "$OPENGL" = "Mesa" ]; then
 # for OpenGL (GLX) support
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET Mesa glu glew"
-  PKG_DEPENDS="$PKG_DEPENDS Mesa glu"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET Mesa glu"
   XBMC_OPENGL="--enable-gl"
 else
   XBMC_OPENGL="--disable-gl"
@@ -73,7 +73,7 @@ fi
 if [ "$OPENGLES_SUPPORT" = yes ]; then
 # for OpenGL-ES support
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET $OPENGLES"
-  PKG_DEPENDS="$PKG_DEPENDS $OPENGLES"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGLES"
   XBMC_OPENGLES="--enable-gles"
 else
   XBMC_OPENGLES="--disable-gles"
@@ -82,7 +82,7 @@ fi
 if [ "$SDL_SUPPORT" = yes ]; then
 # for SDL support
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET SDL SDL_image"
-  PKG_DEPENDS="$PKG_DEPENDS SDL SDL_image"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET SDL SDL_image"
   XBMC_SDL="--enable-sdl"
 else
   XBMC_SDL="--disable-sdl"
@@ -91,7 +91,7 @@ fi
 if [ "$ALSA_SUPPORT" = yes ]; then
 # for ALSA support
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET alsa-lib"
-  PKG_DEPENDS="$PKG_DEPENDS alsa-lib"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET alsa-lib"
   XBMC_ALSA="--enable-alsa"
 else
   XBMC_ALSA="--disable-alsa"
@@ -100,7 +100,7 @@ fi
 if [ "$PULSEAUDIO_SUPPORT" = yes ]; then
 # for PulseAudio support
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET pulseaudio"
-  PKG_DEPENDS="$PKG_DEPENDS pulseaudio"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET pulseaudio"
   XBMC_PULSEAUDIO="--enable-pulse"
 else
   XBMC_PULSEAUDIO="--disable-pulse"
@@ -109,7 +109,7 @@ fi
 if [ "$CEC_SUPPORT" = yes ]; then
 # for CEC support
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET libcec"
-  PKG_DEPENDS="$PKG_DEPENDS libcec"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libcec"
   XBMC_CEC="--enable-libcec"
 else
   XBMC_CEC="--disable-libcec"
@@ -188,12 +188,12 @@ fi
 
 if [ "$FAAC_SUPPORT" = yes ]; then
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET faac"
-  PKG_DEPENDS="$PKG_DEPENDS faac"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET faac"
 fi
 
 if [ "$ENCODER_LAME" = yes ]; then
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET lame"
-  PKG_DEPENDS="$PKG_DEPENDS lame"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET lame"
   XBMC_LAMEENC="--enable-libmp3lame"
 else
   XBMC_LAMEENC="--disable-libmp3lame"
@@ -201,7 +201,7 @@ fi
 
 if [ "$ENCODER_VORBIS" = yes ]; then
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET libvorbis"
-  PKG_DEPENDS="$PKG_DEPENDS libvorbis"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libvorbis"
   XBMC_VORBISENC="--enable-libvorbisenc"
 else
   XBMC_VORBISENC="--disable-libvorbisenc"
@@ -209,7 +209,7 @@ fi
 
 if [ "$BLURAY_SUPPORT" = yes ]; then
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET libbluray"
-  PKG_DEPENDS="$PKG_DEPENDS libbluray"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libbluray"
   XBMC_BLURAY="--enable-libbluray"
 else
   XBMC_BLURAY="--disable-libbluray"
@@ -217,7 +217,7 @@ fi
 
 if [ "$AVAHI_DAEMON" = yes ]; then
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET avahi"
-  PKG_DEPENDS="$PKG_DEPENDS avahi"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET avahi"
   XBMC_AVAHI="--enable-avahi"
 else
   XBMC_AVAHI="--disable-avahi"
@@ -225,7 +225,7 @@ fi
 
 if [ "$MYSQL_SUPPORT" = yes ]; then
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET mysql"
-  PKG_DEPENDS="$PKG_DEPENDS mysql"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET mysql"
   XBMC_MYSQL="--enable-mysql"
 else
   XBMC_MYSQL="--disable-mysql"
@@ -233,7 +233,7 @@ fi
 
 if [ "$AIRPLAY_SUPPORT" = yes ]; then
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET libplist"
-  PKG_DEPENDS="$PKG_DEPENDS libplist"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libplist"
   XBMC_AIRPLAY="--enable-airplay"
 else
   XBMC_AIRPLAY="--disable-airplay"
@@ -241,7 +241,7 @@ fi
 
 if [ "$AIRTUNES_SUPPORT" = yes ]; then
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET libshairplay"
-  PKG_DEPENDS="$PKG_DEPENDS libshairplay"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libshairplay"
   XBMC_AIRTUNES="--enable-airtunes"
 else
   XBMC_AIRTUNES="--disable-airtunes"
@@ -249,7 +249,7 @@ fi
 
 if [ "$NFS_SUPPORT" = yes ]; then
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET libnfs"
-  PKG_DEPENDS="$PKG_DEPENDS libnfs"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libnfs"
   XBMC_NFS="--enable-nfs"
 else
   XBMC_NFS="--disable-nfs"
@@ -257,7 +257,7 @@ fi
 
 if [ "$AFP_SUPPORT" = yes ]; then
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET afpfs-ng"
-  PKG_DEPENDS="$PKG_DEPENDS afpfs-ng"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET afpfs-ng"
   XBMC_AFP="--enable-afpclient"
 else
   XBMC_AFP="--disable-afpclient"
@@ -265,7 +265,7 @@ fi
 
 if [ "$SAMBA_SUPPORT" = yes ]; then
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET samba"
-  PKG_DEPENDS="$PKG_DEPENDS samba"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET samba"
   XBMC_SAMBA="--enable-samba"
 else
   XBMC_SAMBA="--disable-samba"
@@ -292,7 +292,7 @@ fi
 
 if [ ! "$XBMCPLAYER_DRIVER" = default ]; then
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET $XBMCPLAYER_DRIVER"
-  PKG_DEPENDS="$PKG_DEPENDS $XBMCPLAYER_DRIVER"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $XBMCPLAYER_DRIVER"
 
   if [ "$XBMCPLAYER_DRIVER" = bcm2835-driver ]; then
     XBMC_OPENMAX="--enable-openmax"
@@ -311,7 +311,7 @@ fi
 
 if [ "$VDPAU" = yes ]; then
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET libvdpau"
-  PKG_DEPENDS="$PKG_DEPENDS libvdpau"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libvdpau"
   XBMC_VDPAU="--enable-vdpau"
 else
   XBMC_VDPAU="--disable-vdpau"
@@ -319,7 +319,7 @@ fi
 
 if [ "$VAAPI" = yes ]; then
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET libva"
-  PKG_DEPENDS="$PKG_DEPENDS libva"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libva"
   XBMC_VAAPI="--enable-vaapi"
 else
   XBMC_VAAPI="--disable-vaapi"
@@ -327,7 +327,7 @@ fi
 
 if [ "$CRYSTALHD" = yes ]; then
   PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET crystalhd"
-  PKG_DEPENDS="$PKG_DEPENDS crystalhd"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET crystalhd"
   XBMC_CRYSTALHD="--enable-crystalhd"
 else
   XBMC_CRYSTALHD="--disable-crystalhd"