diff --git a/packages/audio/taglib/package.mk b/packages/audio/taglib/package.mk
index 5dea420d28..075689ef35 100644
--- a/packages/audio/taglib/package.mk
+++ b/packages/audio/taglib/package.mk
@@ -24,7 +24,7 @@ PKG_LICENSE="LGPL"
 PKG_SITE="http://taglib.github.com/"
 PKG_URL="https://github.com/downloads/taglib/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS="zlib"
-PKG_BUILD_DEPENDS_TARGET="toolchain cmake zlib"
+PKG_BUILD_DEPENDS_TARGET="toolchain cmake:host zlib"
 PKG_PRIORITY="optional"
 PKG_SECTION="audio"
 PKG_SHORTDESC="taglib: a library for reading and editing the meta-data of several popular audio formats."
diff --git a/packages/toolchain/devel/cmake/build b/packages/devel/cmake/package.mk
old mode 100755
new mode 100644
similarity index 65%
rename from packages/toolchain/devel/cmake/build
rename to packages/devel/cmake/package.mk
index de664801aa..c6a77c001f
--- a/packages/toolchain/devel/cmake/build
+++ b/packages/devel/cmake/package.mk
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
@@ -18,22 +16,34 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-. config/options $1
+PKG_NAME="cmake"
+PKG_VERSION="2.8.12.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="BSD"
+PKG_SITE="http://www.cmake.org/"
+PKG_URL="http://www.cmake.org/files/v2.8/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_HOST=""
+PKG_BUILD_DEPENDS_HOST="ccache:host"
+PKG_PRIORITY="optional"
+PKG_SECTION="toolchain/devel"
+PKG_SHORTDESC="cmake: A cross-platform, open-source make system"
+PKG_LONGDESC="CMake is used to control the software compilation process using simple platform and compiler independent configuration files. CMake generates native makefiles and workspaces that can be used in the compiler environment of your choice. CMake is quite sophisticated: it is possible to support complex environments requiring system configuration, preprocessor generation, code generation, and template instantiation."
 
-setup_toolchain host
+PKG_IS_ADDON="no"
+PKG_AUTORECONF="no"
 
-cd $PKG_BUILD
+configure_host() {
+  ../configure --no-qt-gui
+}
 
-./configure --no-qt-gui
+makeinstall_host() {
+  mkdir -p $ROOT/$TOOLCHAIN/bin
+    cp -P bin/cmake $ROOT/$TOOLCHAIN/bin
+    cp -P bin/cpack $ROOT/$TOOLCHAIN/bin
+    cp -P bin/ctest $ROOT/$TOOLCHAIN/bin
 
-make
-
-mkdir -p $ROOT/$TOOLCHAIN/bin
-  cp -P bin/cmake $ROOT/$TOOLCHAIN/bin
-  cp -P bin/cpack $ROOT/$TOOLCHAIN/bin
-  cp -P bin/ctest $ROOT/$TOOLCHAIN/bin
-
-mkdir -p $ROOT/$TOOLCHAIN/etc
+  mkdir -p $ROOT/$TOOLCHAIN/etc
 
   cat >$ROOT/$TOOLCHAIN/etc/cmake-$TARGET_NAME.conf <<EOF
 # this one is important
@@ -78,3 +88,4 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)
 
 EOF
+}
diff --git a/packages/toolchain/devel/cmake/meta b/packages/toolchain/devel/cmake/meta
deleted file mode 100644
index 70be2102fc..0000000000
--- a/packages/toolchain/devel/cmake/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 <http://www.gnu.org/licenses/>.
-################################################################################
-
-PKG_NAME="cmake"
-PKG_VERSION="2.8.12.1"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="BSD"
-PKG_SITE="http://www.cmake.org/"
-PKG_URL="http://www.cmake.org/files/v2.8/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache:host"
-PKG_PRIORITY="optional"
-PKG_SECTION="toolchain/devel"
-PKG_SHORTDESC="cmake: A cross-platform, open-source make system"
-PKG_LONGDESC="CMake is used to control the software compilation process using simple platform and compiler independent configuration files. CMake generates native makefiles and workspaces that can be used in the compiler environment of your choice. CMake is quite sophisticated: it is possible to support complex environments requiring system configuration, preprocessor generation, code generation, and template instantiation."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="no"
diff --git a/packages/toolchain/meta b/packages/toolchain/meta
index 217c826bd6..872a77b4e1 100644
--- a/packages/toolchain/meta
+++ b/packages/toolchain/meta
@@ -24,8 +24,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
 PKG_DEPENDS=""
-#PKG_BUILD_DEPENDS="make xz:host sed:host pkg-config autotools gcc-final bison:host flex cmake jam scons yasm nasm"
-PKG_BUILD_DEPENDS="make:host xz:host sed:host pkg-config autotools gcc:host bison:host flex cmake scons yasm nasm"
+PKG_BUILD_DEPENDS="make:host xz:host sed:host pkg-config autotools gcc:host bison:host flex cmake:host scons yasm nasm"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
 PKG_SHORTDESC="toolchain: OpenELEC.tv' toolchain"