diff --git a/packages/databases/mysql/build b/packages/databases/mysql/build
index 4af705683a..f794a9234a 100755
--- a/packages/databases/mysql/build
+++ b/packages/databases/mysql/build
@@ -36,8 +36,8 @@ ac_cv_sys_restartable_syscalls=yes \
             --localstatedir=/storage/.mysql \
             --with-unix-socket-path=/var/tmp/mysql.socket \
             --with-tcp-port=3306 \
-            --disable-static \
-            --enable-shared \
+            --enable-static \
+            --disable-shared \
             --with-low-memory \
             --enable-largefile \
             --with-big-tables \
@@ -57,7 +57,7 @@ ac_cv_sys_restartable_syscalls=yes \
             --without-server \
             --without-embedded-server \
             --without-libedit \
-            --without-query-cache \
+            --with-query-cache \
             --without-plugin-partition \
             --without-plugin-daemon_example \
             --without-plugin-ftexample \
@@ -70,18 +70,14 @@ ac_cv_sys_restartable_syscalls=yes \
             --without-plugin-innodb_plugin \
             --without-plugin-ndbcluster \
 
-make -C include
-make -C libmysql
+make
+$MAKEINSTALL
 
-make -C scripts
-  sed -i "s|pkgincludedir=.*|pkgincludedir=\'$SYSROOT_PREFIX/usr/include/mysql\'|" scripts/mysql_config
-  sed -i "s|pkglibdir=.*|pkglibdir=\'$SYSROOT_PREFIX/usr/lib/mysql\'|" scripts/mysql_config
-  cp scripts/mysql_config $SYSROOT_PREFIX/usr/bin
-  ln -sf $SYSROOT_PREFIX/usr/bin/mysql_config $ROOT/$TOOLCHAIN/bin/mysql_config
+sed -i "s|pkgincludedir=.*|pkgincludedir=\'$SYSROOT_PREFIX/usr/include/mysql\'|" scripts/mysql_config
+sed -i "s|pkglibdir=.*|pkglibdir=\'$SYSROOT_PREFIX/usr/lib/mysql\'|" scripts/mysql_config
+cp scripts/mysql_config $SYSROOT_PREFIX/usr/bin
+ln -sf $SYSROOT_PREFIX/usr/bin/mysql_config $ROOT/$TOOLCHAIN/bin/mysql_config
 
-$MAKEINSTALL -C include
-$MAKEINSTALL -C libmysql
-
-for i in `ls -d $SYSROOT_PREFIX/usr/lib/mysql/libmysqlclient*.so*`; do 
+for i in `ls -d $SYSROOT_PREFIX/usr/lib/mysql/*.a`; do 
   ln -v -sf $i $SYSROOT_PREFIX/usr/lib
 done
diff --git a/packages/databases/mysql/install b/packages/databases/mysql/install
deleted file mode 100755
index cc698394c8..0000000000
--- a/packages/databases/mysql/install
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/libmysql/.libs/libmysqlclient.so* $INSTALL/usr/lib
-
-mkdir -p $INSTALL/usr/share/mysql/charsets
-  cp -R $PKG_BUILD/sql/share/charsets/*.xml $INSTALL/usr/share/mysql/charsets
\ No newline at end of file
diff --git a/packages/mediacenter/xbmc-frodo/meta b/packages/mediacenter/xbmc-frodo/meta
index 5979c34277..85f58c28a4 100644
--- a/packages/mediacenter/xbmc-frodo/meta
+++ b/packages/mediacenter/xbmc-frodo/meta
@@ -25,7 +25,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="boost Python zlib bzip2 lzo pcre libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libogg libmodplug faad2 flac libmpeg2 yajl sqlite mysql bc xbmc-addon-settings"
+PKG_DEPENDS="boost Python zlib bzip2 lzo pcre libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libogg libmodplug faad2 flac libmpeg2 yajl sqlite bc xbmc-addon-settings"
 PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libcdio libmodplug faad2 flac libmpeg2 yajl sqlite mysql"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"
diff --git a/packages/mediacenter/xbmc-pvr/meta b/packages/mediacenter/xbmc-pvr/meta
index 8febff6e0c..519730b40c 100644
--- a/packages/mediacenter/xbmc-pvr/meta
+++ b/packages/mediacenter/xbmc-pvr/meta
@@ -25,7 +25,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="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump fontconfig fribidi libjpeg-turbo libpng tiff freetype jasper libmad libogg libvorbis libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql alsa bc xbmc-addon-settings xbmc-addon-xvdr xbmc-addon-vuplus"
+PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump fontconfig fribidi libjpeg-turbo libpng tiff freetype jasper libmad libogg libvorbis libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite alsa bc xbmc-addon-settings xbmc-addon-xvdr xbmc-addon-vuplus"
 PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump fontconfig fribidi libjpeg-turbo 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"
diff --git a/packages/mediacenter/xbmc-rpi/meta b/packages/mediacenter/xbmc-rpi/meta
index b49d6151e0..14bf98ee23 100644
--- a/packages/mediacenter/xbmc-rpi/meta
+++ b/packages/mediacenter/xbmc-rpi/meta
@@ -25,7 +25,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="boost Python zlib bzip2 lzo pcre libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libogg libmodplug faad2 flac libmpeg2 yajl sqlite mysql bc xbmc-addon-settings"
+PKG_DEPENDS="boost Python zlib bzip2 lzo pcre libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libogg libmodplug faad2 flac libmpeg2 yajl sqlite bc xbmc-addon-settings"
 PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre libass enca curl libssh rtmpdump fontconfig fribidi tinyxml libjpeg-turbo libpng tiff freetype jasper libmad libsamplerate libogg libcdio libmodplug faad2 flac libmpeg2 yajl sqlite mysql"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"
diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta
index 38bb526e6c..55b6c4c078 100644
--- a/packages/mediacenter/xbmc/meta
+++ b/packages/mediacenter/xbmc/meta
@@ -25,7 +25,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="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump fontconfig fribidi libjpeg-turbo libpng tiff freetype jasper libmad libogg libvorbis libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql alsa bc xbmc-addon-settings"
+PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump fontconfig fribidi libjpeg-turbo libpng tiff freetype jasper libmad libogg libvorbis libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite alsa bc xbmc-addon-settings"
 PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump fontconfig fribidi libjpeg-turbo 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"