diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk
index 3b2b400943..dc3e5858b7 100644
--- a/packages/mediacenter/xbmc/package.mk
+++ b/packages/mediacenter/xbmc/package.mk
@@ -38,7 +38,7 @@ PKG_AUTORECONF="no"
PKG_DEPENDS="$PKG_DEPENDS dbus"
# needed for hosttools (Texturepacker)
- PKG_BUILD_DEPENDS_TARGET="$PKG_BUILD_DEPENDS_TARGET lzo:host SDL:host SDL_image-host"
+ 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"
diff --git a/packages/multimedia/SDL_image-host/build b/packages/multimedia/SDL_image-host/build
deleted file mode 100755
index e138e15c82..0000000000
--- a/packages/multimedia/SDL_image-host/build
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-# OpenELEC 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 of the License, or
-# (at your option) any later version.
-#
-# OpenELEC 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. If not, see .
-################################################################################
-
-. config/options $1
-
-$SCRIPTS/unpack SDL_image
-
-SDL_IMAGE_DIR=`ls -d $BUILD/SDL_image-[0-9]*`
-
-setup_toolchain host
-
-cd $SDL_IMAGE_DIR
-
-mkdir -p .build-host && cd .build-host
-../configure --host=$HOST_NAME \
- --build=$HOST_NAME \
- --prefix=$ROOT/$TOOLCHAIN \
- --sysconfdir=$ROOT/$TOOLCHAIN/etc \
- --localstatedir=/var \
- --enable-shared \
- --disable-static \
- --disable-bmp \
- --disable-gif \
- --enable-jpg \
- --disable-jpg-shared \
- --disable-lbm \
- --disable-pcx \
- --enable-png \
- --disable-png-shared \
- --disable-pnm \
- --disable-tga \
- --disable-tif \
- --disable-tif-shared \
- --disable-webp \
- --disable-webp-shared \
- --disable-xcf \
- --disable-xpm \
- --disable-xv \
- --with-sdl-prefix=$ROOT/$TOOLCHAIN \
-
-make
-make install
diff --git a/packages/multimedia/SDL_image-host/meta b/packages/multimedia/SDL_image-host/meta
deleted file mode 100644
index a6f22271d3..0000000000
--- a/packages/multimedia/SDL_image-host/meta
+++ /dev/null
@@ -1,34 +0,0 @@
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-# OpenELEC 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 of the License, or
-# (at your option) any later version.
-#
-# OpenELEC 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. If not, see .
-################################################################################
-
-PKG_NAME="SDL_image"
-PKG_VERSION=""
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://www.libsdl.org/"
-PKG_URL=""
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain SDL:host libpng:host libjpeg-turbo:host"
-PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="libsdl_image: A cross-platform Graphic API"
-PKG_LONGDESC="SDL_image is an image loading library that is used with the SDL library, and almost as portable. It allows a programmer to use multiple image formats without having to code all the loading and conversion algorithms themselves."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"
diff --git a/packages/multimedia/SDL_image/build b/packages/multimedia/SDL_image/build
deleted file mode 100755
index a32bd2ec60..0000000000
--- a/packages/multimedia/SDL_image/build
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-# OpenELEC 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 of the License, or
-# (at your option) any later version.
-#
-# OpenELEC 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. If not, see .
-################################################################################
-
-. config/options $1
-
-cd $PKG_BUILD
-
-# create some files needed for autoreconf
- touch NEWS AUTHORS ChangeLog
- do_autoreconf
-
-mkdir -p .build-target && cd .build-target
-../configure --host=$TARGET_NAME \
- --build=$HOST_NAME \
- --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --enable-shared \
- --disable-static \
- --enable-bmp \
- --enable-gif \
- --enable-jpg \
- --disable-jpg-shared \
- --disable-lbm \
- --enable-pcx \
- --enable-png \
- --disable-png-shared \
- --enable-pnm \
- --enable-tga \
- --enable-tif \
- --disable-tif-shared \
- --enable-xcf \
- --enable-xpm \
- --enable-xv \
- --with-sdl-prefix=$SYSROOT_PREFIX/usr \
-
-make
-
-$MAKEINSTALL
diff --git a/packages/multimedia/SDL_image/install b/packages/multimedia/SDL_image/install
deleted file mode 100755
index 7e1dbf537b..0000000000
--- a/packages/multimedia/SDL_image/install
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-# OpenELEC 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 of the License, or
-# (at your option) any later version.
-#
-# OpenELEC 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. If not, see .
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/usr/lib
- cp -P $PKG_BUILD/.build-target/.libs/*.so* $INSTALL/usr/lib
-
diff --git a/packages/multimedia/SDL_image/meta b/packages/multimedia/SDL_image/meta
deleted file mode 100644
index fc61bfcc77..0000000000
--- a/packages/multimedia/SDL_image/meta
+++ /dev/null
@@ -1,34 +0,0 @@
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
-#
-# OpenELEC 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 of the License, or
-# (at your option) any later version.
-#
-# OpenELEC 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. If not, see .
-################################################################################
-
-PKG_NAME="SDL_image"
-PKG_VERSION="1.2.12"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://www.libsdl.org/"
-PKG_URL="http://www.libsdl.org/projects/SDL_image/release/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="SDL"
-PKG_BUILD_DEPENDS="toolchain SDL libjpeg-turbo libpng tiff"
-PKG_PRIORITY="optional"
-PKG_SECTION="multimedia"
-PKG_SHORTDESC="libsdl_image: A cross-platform Graphic API"
-PKG_LONGDESC="SDL_image is an image loading library that is used with the SDL library, and almost as portable. It allows a programmer to use multiple image formats without having to code all the loading and conversion algorithms themselves."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"
diff --git a/packages/multimedia/SDL_image/package.mk b/packages/multimedia/SDL_image/package.mk
new file mode 100644
index 0000000000..b5f7a4d4cd
--- /dev/null
+++ b/packages/multimedia/SDL_image/package.mk
@@ -0,0 +1,72 @@
+################################################################################
+# This file is part of OpenELEC - http://www.openelec.tv
+# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
+#
+# OpenELEC 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 of the License, or
+# (at your option) any later version.
+#
+# OpenELEC 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. If not, see .
+################################################################################
+
+PKG_NAME="SDL_image"
+PKG_VERSION="1.2.12"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://www.libsdl.org/"
+PKG_URL="http://www.libsdl.org/projects/SDL_image/release/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_HOST=""
+PKG_DEPENDS_TARGET="SDL"
+PKG_BUILD_DEPENDS_HOST="toolchain SDL:host libpng:host libjpeg-turbo:host"
+PKG_BUILD_DEPENDS_TARGET="toolchain SDL libjpeg-turbo libpng tiff"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="libsdl_image: A cross-platform Graphic API"
+PKG_LONGDESC="SDL_image is an image loading library that is used with the SDL library, and almost as portable. It allows a programmer to use multiple image formats without having to code all the loading and conversion algorithms themselves."
+
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_HOST="--disable-bmp \
+ --disable-gif \
+ --enable-jpg \
+ --disable-jpg-shared \
+ --disable-lbm \
+ --disable-pcx \
+ --enable-png \
+ --disable-png-shared \
+ --disable-pnm \
+ --disable-tga \
+ --disable-tif \
+ --disable-tif-shared \
+ --disable-webp \
+ --disable-webp-shared \
+ --disable-xcf \
+ --disable-xpm \
+ --disable-xv \
+ --with-sdl-prefix=$ROOT/$TOOLCHAIN"
+
+PKG_CONFIGURE_OPTS_TARGET="--enable-bmp \
+ --enable-gif \
+ --enable-jpg \
+ --disable-jpg-shared \
+ --disable-lbm \
+ --enable-pcx \
+ --enable-png \
+ --disable-png-shared \
+ --enable-pnm \
+ --enable-tga \
+ --enable-tif \
+ --disable-tif-shared \
+ --enable-xcf \
+ --enable-xpm \
+ --enable-xv \
+ --with-sdl-prefix=$SYSROOT_PREFIX/usr"