diff --git a/packages/toolchain/devel/make/meta b/packages/devel/make/package.mk
similarity index 97%
rename from packages/toolchain/devel/make/meta
rename to packages/devel/make/package.mk
index a6aeef687b..90cdf4d9af 100644
--- a/packages/toolchain/devel/make/meta
+++ b/packages/devel/make/package.mk
@@ -24,11 +24,13 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/make/"
 PKG_URL="http://ftp.gnu.org/gnu/make/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS=""
+PKG_BUILD_DEPENDS_HOST=""
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
 PKG_SHORTDESC="make: GNU make utility to maintain groups of programs"
 PKG_LONGDESC="The 'make' utility automatically determines which pieces of a large program need to be recompiled, and issues commands to recompile them. This is GNU 'make', which was implemented by Richard Stallman and Roland McGrath. GNU 'make' conforms to section 6.2 of EEE Standard 1003.2-1992' (POSIX.2)."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
+
+export CC=$LOCAL_CC
diff --git a/packages/toolchain/devel/make/patches/make-3.82-011-noclock_gettime.patch b/packages/devel/make/patches/make-3.82-011-noclock_gettime.patch
similarity index 100%
rename from packages/toolchain/devel/make/patches/make-3.82-011-noclock_gettime.patch
rename to packages/devel/make/patches/make-3.82-011-noclock_gettime.patch
diff --git a/packages/toolchain/devel/make/patches/make-3.82-012-j8k.patch b/packages/devel/make/patches/make-3.82-012-j8k.patch
similarity index 100%
rename from packages/toolchain/devel/make/patches/make-3.82-012-j8k.patch
rename to packages/devel/make/patches/make-3.82-012-j8k.patch
diff --git a/packages/toolchain/devel/make/patches/make-3.82-013-getcwd.patch b/packages/devel/make/patches/make-3.82-013-getcwd.patch
similarity index 100%
rename from packages/toolchain/devel/make/patches/make-3.82-013-getcwd.patch
rename to packages/devel/make/patches/make-3.82-013-getcwd.patch
diff --git a/packages/toolchain/devel/make/patches/make-3.82-014-err-reporting.patch b/packages/devel/make/patches/make-3.82-014-err-reporting.patch
similarity index 100%
rename from packages/toolchain/devel/make/patches/make-3.82-014-err-reporting.patch
rename to packages/devel/make/patches/make-3.82-014-err-reporting.patch
diff --git a/packages/toolchain/devel/make/patches/make-3.82-016-weird-shell.patch b/packages/devel/make/patches/make-3.82-016-weird-shell.patch
similarity index 100%
rename from packages/toolchain/devel/make/patches/make-3.82-016-weird-shell.patch
rename to packages/devel/make/patches/make-3.82-016-weird-shell.patch
diff --git a/packages/toolchain/devel/make/patches/make-3.82-017-newlines.patch b/packages/devel/make/patches/make-3.82-017-newlines.patch
similarity index 100%
rename from packages/toolchain/devel/make/patches/make-3.82-017-newlines.patch
rename to packages/devel/make/patches/make-3.82-017-newlines.patch
diff --git a/packages/toolchain/devel/make/patches/make-3.82-018-jobserver.patch b/packages/devel/make/patches/make-3.82-018-jobserver.patch
similarity index 100%
rename from packages/toolchain/devel/make/patches/make-3.82-018-jobserver.patch
rename to packages/devel/make/patches/make-3.82-018-jobserver.patch
diff --git a/packages/toolchain/devel/make/patches/make-3.82-019-bugfixes.patch b/packages/devel/make/patches/make-3.82-019-bugfixes.patch
similarity index 100%
rename from packages/toolchain/devel/make/patches/make-3.82-019-bugfixes.patch
rename to packages/devel/make/patches/make-3.82-019-bugfixes.patch
diff --git a/packages/toolchain/devel/make/patches/make-3.82-020-sort-blank.patch b/packages/devel/make/patches/make-3.82-020-sort-blank.patch
similarity index 100%
rename from packages/toolchain/devel/make/patches/make-3.82-020-sort-blank.patch
rename to packages/devel/make/patches/make-3.82-020-sort-blank.patch
diff --git a/packages/toolchain/devel/make/patches/make-3.82-021-copy-on-expand.patch b/packages/devel/make/patches/make-3.82-021-copy-on-expand.patch
similarity index 100%
rename from packages/toolchain/devel/make/patches/make-3.82-021-copy-on-expand.patch
rename to packages/devel/make/patches/make-3.82-021-copy-on-expand.patch
diff --git a/packages/toolchain/devel/make/patches/make-3.82-022-parallel-remake.patch b/packages/devel/make/patches/make-3.82-022-parallel-remake.patch
similarity index 100%
rename from packages/toolchain/devel/make/patches/make-3.82-022-parallel-remake.patch
rename to packages/devel/make/patches/make-3.82-022-parallel-remake.patch
diff --git a/packages/toolchain/devel/make/patches/make-3.82-023-warn_undefined_function.patch b/packages/devel/make/patches/make-3.82-023-warn_undefined_function.patch
similarity index 100%
rename from packages/toolchain/devel/make/patches/make-3.82-023-warn_undefined_function.patch
rename to packages/devel/make/patches/make-3.82-023-warn_undefined_function.patch
diff --git a/packages/toolchain/devel/make/patches/make-3.82-024-trace.patch b/packages/devel/make/patches/make-3.82-024-trace.patch
similarity index 100%
rename from packages/toolchain/devel/make/patches/make-3.82-024-trace.patch
rename to packages/devel/make/patches/make-3.82-024-trace.patch
diff --git a/packages/toolchain/devel/make/patches/make-3.82-025-expensive_glob.patch b/packages/devel/make/patches/make-3.82-025-expensive_glob.patch
similarity index 100%
rename from packages/toolchain/devel/make/patches/make-3.82-025-expensive_glob.patch
rename to packages/devel/make/patches/make-3.82-025-expensive_glob.patch
diff --git a/packages/toolchain/devel/make/build b/packages/toolchain/devel/make/build
deleted file mode 100755
index be79d3e7c6..0000000000
--- a/packages/toolchain/devel/make/build
+++ /dev/null
@@ -1,34 +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
-CC=$LOCAL_CC
-
-cd $PKG_BUILD
-./configure --host=$HOST_NAME \
-            --build=$HOST_NAME \
-            --disable-nls
-
-/bin/sh build.sh
-
-mkdir -p $ROOT/$TOOLCHAIN/bin
-  cp make $ROOT/$TOOLCHAIN/bin
diff --git a/packages/toolchain/meta b/packages/toolchain/meta
index d9005d05fe..dd552fac06 100644
--- a/packages/toolchain/meta
+++ b/packages/toolchain/meta
@@ -25,7 +25,7 @@ PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
 PKG_DEPENDS=""
 #PKG_BUILD_DEPENDS="make xz sed pkg-config autotools gcc-final bison:host flex cmake jam scons yasm nasm"
-PKG_BUILD_DEPENDS="make xz sed pkg-config autotools gcc:host bison:host flex cmake scons yasm nasm"
+PKG_BUILD_DEPENDS="make:host xz sed pkg-config autotools gcc:host bison:host flex cmake scons yasm nasm"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
 PKG_SHORTDESC="toolchain: OpenELEC.tv' toolchain"