diff --git a/packages/devel/gmp/build b/packages/devel/gmp/build
deleted file mode 100755
index 4038d85ff5..0000000000
--- a/packages/devel/gmp/build
+++ /dev/null
@@ -1,42 +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
-
-export CFLAGS="$CFLAGS -fPIC"
-export CPPFLAGS="$CPPFLAGS -fexceptions"
-export CC_FOR_BUILD="$HOST_CC"
-
-cd $PKG_BUILD
-mkdir -p .objdir-target && cd .objdir-target
-../configure --host=$TARGET_NAME \
-             --build=$HOST_NAME \
-             --prefix=/usr \
-             --sysconfdir=/etc \
-             --datadir=/usr/share \
-             --localstatedir=/var \
-             --disable-static \
-             --enable-shared \
-             --disable-cxx \
-
-make
-$MAKEINSTALL
diff --git a/packages/devel/gmp/install b/packages/devel/gmp/install
deleted file mode 100755
index 4eba6ee91b..0000000000
--- a/packages/devel/gmp/install
+++ /dev/null
@@ -1,26 +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/.objdir-target/.libs/libgmp.so* $INSTALL/usr/lib
diff --git a/packages/devel/gmp/meta b/packages/devel/gmp/package.mk
similarity index 84%
rename from packages/devel/gmp/meta
rename to packages/devel/gmp/package.mk
index 880fe82414..8b5e7196ee 100644
--- a/packages/devel/gmp/meta
+++ b/packages/devel/gmp/package.mk
@@ -26,7 +26,8 @@ PKG_LICENSE="LGPL"
 PKG_SITE="http://gmplib.org/"
 PKG_URL="ftp://ftp.gmplib.org/pub/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
+PKG_BUILD_DEPENDS_HOST="ccache"
+PKG_BUILD_DEPENDS_TARGET="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="devel"
 PKG_SHORTDESC="gmp: The GNU MP (multiple precision arithmetic) library"
@@ -34,3 +35,17 @@ PKG_LONGDESC="GNU MP is a library for arbitrary precision arithmetic, operating
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="yes"
+
+PKG_CONFIGURE_OPTS_HOST="--enable-cxx"
+PKG_CONFIGURE_OPTS_TARGET="--disable-cxx"
+
+pre_configure_host() {
+  export CFLAGS="$CFLAGS -fPIC -DPIC"
+  export CPPFLAGS="$CPPFLAGS -fexceptions"
+}
+
+pre_configure_target() {
+  export CFLAGS="$CFLAGS -fPIC"
+  export CPPFLAGS="$CPPFLAGS -fexceptions"
+  export CC_FOR_BUILD="$HOST_CC"
+}
diff --git a/packages/toolchain/devel/binutils/meta b/packages/toolchain/devel/binutils/meta
index 4632f089ee..35f397e86d 100644
--- a/packages/toolchain/devel/binutils/meta
+++ b/packages/toolchain/devel/binutils/meta
@@ -29,7 +29,7 @@ PKG_SITE="http://www.gnu.org/software/binutils/binutils.html"
 PKG_URL="http://ftp.gnu.org/gnu/binutils/$PKG_NAME-$PKG_VERSION.tar.gz"
 #PKG_URL="ftp://ftp.kernel.org/pub/linux/devel/binutils/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache bison:host flex linux-headers gmp-host mpfr cloog ppl:host"
+PKG_BUILD_DEPENDS="ccache bison:host flex linux-headers gmp:host mpfr cloog ppl:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
 PKG_SHORTDESC="binutils: A GNU collection of binary utilities"
diff --git a/packages/toolchain/lang/gcc-core/meta b/packages/toolchain/lang/gcc-core/meta
index ab2396072e..181888f8ec 100644
--- a/packages/toolchain/lang/gcc-core/meta
+++ b/packages/toolchain/lang/gcc-core/meta
@@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://gcc.gnu.org/"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache autoconf-2.64 binutils gmp-host mpfr mpc cloog ppl:host"
+PKG_BUILD_DEPENDS="ccache autoconf-2.64 binutils gmp:host mpfr mpc cloog ppl:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/lang"
 PKG_SHORTDESC="gcc: The GNU Compiler Collection Version 4 (aka GNU C Compiler)"
diff --git a/packages/toolchain/lang/gcc-final/meta b/packages/toolchain/lang/gcc-final/meta
index 2cd92a6b54..a642644b8f 100644
--- a/packages/toolchain/lang/gcc-final/meta
+++ b/packages/toolchain/lang/gcc-final/meta
@@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://gcc.gnu.org/"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache autoconf-2.64 binutils gmp-host mpfr mpc cloog ppl:host eglibc"
+PKG_BUILD_DEPENDS="ccache autoconf-2.64 binutils gmp:host mpfr mpc cloog ppl:host eglibc"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/lang"
 PKG_SHORTDESC="gcc: The GNU Compiler Collection Version 4 (aka GNU C Compiler)"
diff --git a/packages/toolchain/math/cloog/meta b/packages/toolchain/math/cloog/meta
index d20dc209e8..d28f094a1e 100644
--- a/packages/toolchain/math/cloog/meta
+++ b/packages/toolchain/math/cloog/meta
@@ -26,7 +26,7 @@ PKG_LICENSE="LGPL"
 PKG_SITE="http://www.cloog.org/"
 PKG_URL="http://www.bastoul.net/cloog/pages/download/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache gmp-host"
+PKG_BUILD_DEPENDS="ccache gmp:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/math"
 PKG_SHORTDESC="cloog: a free software and library to generate code for scanning Z-polyhedra."
diff --git a/packages/toolchain/math/gmp-host/build b/packages/toolchain/math/gmp-host/build
deleted file mode 100755
index 38e4225a80..0000000000
--- a/packages/toolchain/math/gmp-host/build
+++ /dev/null
@@ -1,45 +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
-
-$SCRIPTS/unpack gmp
-
-setup_toolchain host
-
-export CFLAGS="$CFLAGS -fPIC -DPIC"
-export CPPFLAGS="$CPPFLAGS -fexceptions"
-
-cd $BUILD/gmp-*
-
-mkdir -p .objdir-host && cd .objdir-host
-
-../configure --host=$HOST_NAME \
-             --build=$HOST_NAME \
-             --prefix=$ROOT/$TOOLCHAIN \
-             --enable-shared \
-             --disable-static \
-             --enable-cxx \
-
-make
-make check
-make install
diff --git a/packages/toolchain/math/gmp-host/meta b/packages/toolchain/math/gmp-host/meta
deleted file mode 100644
index 1a92585e13..0000000000
--- a/packages/toolchain/math/gmp-host/meta
+++ /dev/null
@@ -1,36 +0,0 @@
-################################################################################
-#      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
-################################################################################
-
-PKG_NAME="gmp"
-PKG_VERSION=""
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="LGPL"
-PKG_SITE="http://gmplib.org/"
-PKG_URL=""
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache"
-PKG_PRIORITY="optional"
-PKG_SECTION="toolchain/math"
-PKG_SHORTDESC="gmp: The GNU MP (multiple precision arithmetic) library"
-PKG_LONGDESC="GNU MP is a library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers. It has a rich set of functions, and the functions have a regular interface. GNU MP is designed to be as fast as possible, both for small operands and for huge operands. The speed is achieved by using fullwords as the basic arithmetic type, by using fast algorithms, by carefully optimized assembly code for the most common inner loops for a lots of CPUs, and by a general emphasis on speed (instead of simplicity or elegance). The speed of GNU MP is believed to be faster than any other similar library. The advantage for GNU MP increases with the operand sizes for certain operations, since GNU MP in many cases has asymptotically faster algorithms."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"
diff --git a/packages/toolchain/math/mpc/meta b/packages/toolchain/math/mpc/meta
index c7cc50d830..3618bc29c7 100644
--- a/packages/toolchain/math/mpc/meta
+++ b/packages/toolchain/math/mpc/meta
@@ -26,7 +26,7 @@ PKG_LICENSE="LGPL"
 PKG_SITE="http://www.multiprecision.org"
 PKG_URL="http://www.multiprecision.org/mpc/download/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache gmp-host mpfr"
+PKG_BUILD_DEPENDS="ccache gmp:host mpfr"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/math"
 PKG_SHORTDESC="mpc: A C library for the arithmetic of high precision complex numbers"
diff --git a/packages/toolchain/math/mpfr/meta b/packages/toolchain/math/mpfr/meta
index 35995abbb8..cb7ca2fcb0 100644
--- a/packages/toolchain/math/mpfr/meta
+++ b/packages/toolchain/math/mpfr/meta
@@ -26,7 +26,7 @@ PKG_LICENSE="LGPL"
 PKG_SITE="http://www.mpfr.org/"
 PKG_URL="http://ftp.gnu.org/gnu/mpfr/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache gmp-host"
+PKG_BUILD_DEPENDS="ccache gmp:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/math"
 PKG_SHORTDESC="mpfr: A C library for multiple-precision floating-point computations with exact roundi"
diff --git a/packages/toolchain/math/ppl/package.mk b/packages/toolchain/math/ppl/package.mk
index 97e15a305e..ea7607d0f1 100644
--- a/packages/toolchain/math/ppl/package.mk
+++ b/packages/toolchain/math/ppl/package.mk
@@ -27,7 +27,7 @@ PKG_SITE="http://www.cs.unipr.it/ppl"
 PKG_URL="http://bugseng.com/products/ppl/download/ftp/snapshots/$PKG_NAME-$PKG_VERSION.tar.xz"
 #PKG_URL="http://bugseng.com/products/ppl/download/ftp/releases/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache gmp-host"
+PKG_BUILD_DEPENDS="ccache gmp:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/math"
 PKG_SHORTDESC="ppl: Parma Polyhedra Library"