diff --git a/packages/devel/binutils/package.mk b/packages/devel/binutils/package.mk
index 28ee26727b..c4ee0b2698 100644
--- a/packages/devel/binutils/package.mk
+++ b/packages/devel/binutils/package.mk
@@ -24,7 +24,7 @@ PKG_LICENSE="GPL"
 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_DEPENDS_HOST=""
-PKG_BUILD_DEPENDS_HOST="ccache:host bison:host flex:flex linux:host gmp:host mpfr cloog ppl:host"
+PKG_BUILD_DEPENDS_HOST="ccache:host bison:host flex:flex linux:host gmp:host mpfr cloog:host ppl:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
 PKG_SHORTDESC="binutils: A GNU collection of binary utilities"
diff --git a/packages/toolchain/math/cloog/meta b/packages/devel/cloog/package.mk
similarity index 75%
rename from packages/toolchain/math/cloog/meta
rename to packages/devel/cloog/package.mk
index fff6321f07..2a4da15e03 100644
--- a/packages/toolchain/math/cloog/meta
+++ b/packages/devel/cloog/package.mk
@@ -23,12 +23,23 @@ PKG_ARCH="any"
 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:host gmp:host"
+PKG_DEPENDS_HOST=""
+PKG_BUILD_DEPENDS_HOST="ccache:host gmp:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/math"
 PKG_SHORTDESC="cloog: a free software and library to generate code for scanning Z-polyhedra."
 PKG_LONGDESC="CLooG is a library to generate code for scanning Z-polyhedra. In other words, it finds code that reaches each integral point of one or more parameterized polyhedra. GCC links with this library in order to enable the new loop generation code known as Graphite."
-PKG_IS_ADDON="no"
 
-PKG_AUTORECONF="no" #TODO: automake 1.13 support must be fixed
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
+
+# TODO: automake 1.13 support must be fixed
+
+PKG_CONFIGURE_OPTS_HOST="--target=$TARGET_NAME \
+                         --enable-shared \
+                         --disable-static \
+                         --disable-silent-rules \
+                         --with-gnu-ld \
+                         --with-isl=buildin \
+                         --with-gmp=system \
+                         --with-gmp-prefix=$ROOT/$TOOLCHAIN"
diff --git a/packages/toolchain/math/cloog/patches/cloog-0.18.0-automake.patch b/packages/devel/cloog/patches/cloog-0.18.0-automake.patch
similarity index 100%
rename from packages/toolchain/math/cloog/patches/cloog-0.18.0-automake.patch
rename to packages/devel/cloog/patches/cloog-0.18.0-automake.patch
diff --git a/packages/lang/gcc/package.mk b/packages/lang/gcc/package.mk
index d08cbd6eab..870aea9e8b 100644
--- a/packages/lang/gcc/package.mk
+++ b/packages/lang/gcc/package.mk
@@ -24,10 +24,10 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://gcc.gnu.org/"
 PKG_URL="ftp://ftp.gnu.org/gnu/gcc/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache:host autoconf-2.64 binutils:host gmp:host mpfr mpc cloog ppl:host"
-PKG_BUILD_DEPENDS_BOOTSTRAP="ccache:host autoconf-2.64 binutils:host gmp:host mpfr mpc cloog ppl:host"
+PKG_BUILD_DEPENDS="ccache:host autoconf-2.64 binutils:host gmp:host mpfr mpc cloog:host ppl:host"
+PKG_BUILD_DEPENDS_BOOTSTRAP="ccache:host autoconf-2.64 binutils:host gmp:host mpfr mpc cloog:host ppl:host"
 PKG_BUILD_DEPENDS_TARGET="gcc:host"
-PKG_BUILD_DEPENDS_HOST="ccache:host autoconf-2.64 binutils:host gmp:host mpfr mpc cloog ppl:host eglibc"
+PKG_BUILD_DEPENDS_HOST="ccache:host autoconf-2.64 binutils:host gmp:host mpfr mpc cloog:host ppl:host eglibc"
 PKG_PRIORITY="optional"
 PKG_SECTION="lang"
 PKG_SHORTDESC="gcc: The GNU Compiler Collection Version 4 (aka GNU C Compiler)"
diff --git a/packages/toolchain/math/cloog/build b/packages/toolchain/math/cloog/build
deleted file mode 100755
index dbf31e2730..0000000000
--- a/packages/toolchain/math/cloog/build
+++ /dev/null
@@ -1,40 +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 <http://www.gnu.org/licenses/>.
-################################################################################
-
-. config/options $1
-
-setup_toolchain host
-
-cd $PKG_BUILD
-mkdir -p objdir-host && cd objdir-host
-../configure --host=$HOST_NAME \
-             --build=$HOST_NAME \
-             --target=$TARGET_NAME \
-             --prefix=$ROOT/$TOOLCHAIN \
-             --enable-shared \
-             --disable-static \
-             --disable-silent-rules \
-             --with-gnu-ld \
-             --with-isl=buildin \
-             --with-gmp=system \
-             --with-gmp-prefix="$ROOT/$TOOLCHAIN" \
-
-make
-make install