diff --git a/packages/mediacenter/xbmc-pvr-addons/meta b/packages/mediacenter/xbmc-pvr-addons/meta
index 2f9c901f4e..70179b23e2 100644
--- a/packages/mediacenter/xbmc-pvr-addons/meta
+++ b/packages/mediacenter/xbmc-pvr-addons/meta
@@ -25,11 +25,16 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/opdenkamp/xbmc-pvr-addons"
 PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="mysql curl"
-PKG_BUILD_DEPENDS="toolchain mysql curl"
+PKG_DEPENDS="curl"
+PKG_BUILD_DEPENDS="toolchain curl"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"
 PKG_SHORTDESC="Various PVR addons for XBMC" 
 PKG_LONGDESC="This addons allows XBMC PVR to connect to various TV/PVR backends and tuners."
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="yes"
+
+if [ "$MYSQL_SUPPORT" = yes ]; then
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS mysql"
+  PKG_DEPENDS="$PKG_DEPENDS mysql"
+fi
diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index dd3236119a..77e3b12bae 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -152,6 +152,13 @@ else
   XBMC_UPNP="--disable-upnp"
 fi
 
+if [ "$MYSQL_SUPPORT" = yes ]; then
+  XBMC_MYSQL="--enable-mysql"
+else
+  XBMC_MYSQL="--disable-mysql"
+
+fi
+
 if [ "$NFS_SUPPORT" = yes ]; then
   XBMC_NFS="--enable-nfs"
 else
@@ -288,6 +295,7 @@ cd $PKG_BUILD
             --disable-hal \
             $XBMC_AVAHI \
             $XBMC_UPNP \
+            $XBMC_MYSQL \
             $XBMC_AIRPLAY \
             $XBMC_AIRTUNES \
             $XBMC_NONFREE \
diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta
index e9c833cadd..3e0dca1c55 100644
--- a/packages/mediacenter/xbmc/meta
+++ b/packages/mediacenter/xbmc/meta
@@ -26,7 +26,7 @@ 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 systemd pcre ffmpeg libass curl libssh rtmpdump fontconfig tinyxml freetype libmad libogg libmodplug faad2 flac libmpeg2 taglib yajl sqlite bc xbmc-addon-settings"
-PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 systemd lzo pcre swig ffmpeg libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libcdio libmodplug faad2 flac libmpeg2 taglib yajl sqlite mysql"
+PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 systemd lzo pcre swig ffmpeg libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libcdio libmodplug faad2 flac libmpeg2 taglib yajl sqlite"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"
 PKG_SHORTDESC="xbmc: XBMC Mediacenter"
@@ -130,6 +130,11 @@ if [ "$AVAHI_DAEMON" = yes ]; then
   PKG_DEPENDS="$PKG_DEPENDS avahi"
 fi
 
+if [ "$MYSQL_SUPPORT" = yes ]; then
+  PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS mysql"
+  PKG_DEPENDS="$PKG_DEPENDS mysql"
+fi
+
 if [ "$AIRPLAY_SUPPORT" = yes ]; then
   PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS libplist"
   PKG_DEPENDS="$PKG_DEPENDS libplist"
diff --git a/projects/ATV/options b/projects/ATV/options
index c501595d13..c2808dd626 100755
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -178,6 +178,9 @@
 # build with UPnP support (yes / no)
   UPNP_SUPPORT="yes"
 
+# build with MySQL support (yes / no)
+  MYSQL_SUPPORT="yes"
+
 # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
   AIRPLAY_SUPPORT="yes"
 
diff --git a/projects/Fusion/options b/projects/Fusion/options
index 82e16508ef..18a10c783a 100755
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@@ -177,6 +177,9 @@
 # build with UPnP support (yes / no)
   UPNP_SUPPORT="yes"
 
+# build with MySQL support (yes / no)
+  MYSQL_SUPPORT="yes"
+
 # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
   AIRPLAY_SUPPORT="yes"
 
diff --git a/projects/Generic/options b/projects/Generic/options
index 0feffc3320..aa23c4ca6a 100755
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -177,6 +177,9 @@
 # build with UPnP support (yes / no)
   UPNP_SUPPORT="yes"
 
+# build with MySQL support (yes / no)
+  MYSQL_SUPPORT="yes"
+
 # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
   AIRPLAY_SUPPORT="yes"
 
diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options
index 463f487591..73cc89cb88 100755
--- a/projects/Generic_OSS/options
+++ b/projects/Generic_OSS/options
@@ -177,6 +177,9 @@
 # build with UPnP support (yes / no)
   UPNP_SUPPORT="yes"
 
+# build with MySQL support (yes / no)
+  MYSQL_SUPPORT="yes"
+
 # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
   AIRPLAY_SUPPORT="yes"
 
diff --git a/projects/ION/options b/projects/ION/options
index 48b563bba6..e24e7224fb 100755
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -177,6 +177,9 @@
 # build with UPnP support (yes / no)
   UPNP_SUPPORT="yes"
 
+# build with MySQL support (yes / no)
+  MYSQL_SUPPORT="yes"
+
 # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
   AIRPLAY_SUPPORT="yes"
 
diff --git a/projects/Intel/options b/projects/Intel/options
index 2b76884fc6..ad0e3c5294 100755
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -177,6 +177,9 @@
 # build with UPnP support (yes / no)
   UPNP_SUPPORT="yes"
 
+# build with MySQL support (yes / no)
+  MYSQL_SUPPORT="yes"
+
 # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
   AIRPLAY_SUPPORT="yes"
 
diff --git a/projects/RPi/options b/projects/RPi/options
index 1ffaf28924..ed68646f98 100755
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -177,6 +177,9 @@
 # build with UPnP support (yes / no)
   UPNP_SUPPORT="yes"
 
+# build with MySQL support (yes / no)
+  MYSQL_SUPPORT="yes"
+
 # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
   AIRPLAY_SUPPORT="yes"
 
diff --git a/projects/Ultra/options b/projects/Ultra/options
index cb6fe2db50..90f668628b 100755
--- a/projects/Ultra/options
+++ b/projects/Ultra/options
@@ -177,6 +177,9 @@
 # build with UPnP support (yes / no)
   UPNP_SUPPORT="yes"
 
+# build with MySQL support (yes / no)
+  MYSQL_SUPPORT="yes"
+
 # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
   AIRPLAY_SUPPORT="yes"
 
diff --git a/projects/Virtual/options b/projects/Virtual/options
index 745dccbfec..de06d3ba27 100755
--- a/projects/Virtual/options
+++ b/projects/Virtual/options
@@ -172,6 +172,9 @@
 # build with UPnP support (yes / no)
   UPNP_SUPPORT="yes"
 
+# build with MySQL support (yes / no)
+  MYSQL_SUPPORT="yes"
+
 # build with AirPlay support (stream videos from iDevices to XBMC) (yes / no)
   AIRPLAY_SUPPORT="yes"