diff --git a/packages/toolchain/devel/binutils/meta b/packages/toolchain/devel/binutils/meta
index 2f1f838038..3e13dac55c 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 flex linux-headers gmp-host mpfr cloog ppl"
+PKG_BUILD_DEPENDS="ccache bison:host flex linux-headers gmp-host mpfr cloog ppl"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
 PKG_SHORTDESC="binutils: A GNU collection of binary utilities"
diff --git a/packages/toolchain/devel/bison/build b/packages/toolchain/devel/bison/build
deleted file mode 100755
index 6f775210a9..0000000000
--- a/packages/toolchain/devel/bison/build
+++ /dev/null
@@ -1,40 +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
-
-setup_toolchain host
-
-cd $PKG_BUILD
-./configure --host=$HOST_NAME \
-            --build=$HOST_NAME \
-            --prefix=$ROOT/$TOOLCHAIN \
-            --disable-rpath \
-            --with-gnu-ld
-
-# The configure system causes Bison to be built without support for
-# internationalization of error messages if a bison program is not already in
-# $PATH. The following addition will correct this:
-  echo '#define YYENABLE_NLS 1' >> lib/config.h
-
-make
-make install
diff --git a/packages/toolchain/devel/bison/meta b/packages/toolchain/devel/bison/package.mk
similarity index 84%
rename from packages/toolchain/devel/bison/meta
rename to packages/toolchain/devel/bison/package.mk
index b2c3a7dc3b..dd4073a5d7 100644
--- a/packages/toolchain/devel/bison/meta
+++ b/packages/toolchain/devel/bison/package.mk
@@ -26,11 +26,20 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/bison/"
 PKG_URL="http://ftp.gnu.org/gnu/bison/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache"
+PKG_BUILD_DEPENDS_HOST="ccache"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
 PKG_SHORTDESC="bison: The GNU general-purpose parser generator"
 PKG_LONGDESC="Bison is a general-purpose parser generator that converts a grammar description for an LALR(1) context-free grammar into a C program to parse that grammar. Once you are proficient with Bison, you may use it to develop a wide range of language parsers, from those used in simple desk calculators to complex programming languages. Bison is upward compatible with Yacc: all properly-written Yacc grammars ought to work with Bison with no change. Anyone familiar with Yacc should be able to use Bison with little trouble. You need to be fluent in C programming in order to use Bison or to understand this manual."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
+
+PKG_CONFIGURE_OPTS_HOST="--disable-rpath --with-gnu-ld"
+
+post_configure_host() {
+# The configure system causes Bison to be built without support for
+# internationalization of error messages if a bison program is not already in
+# $PATH. The following addition will correct this:
+  echo '#define YYENABLE_NLS 1' >> lib/config.h
+}
diff --git a/packages/toolchain/meta b/packages/toolchain/meta
index 9a85dbce6b..084caf44d7 100644
--- a/packages/toolchain/meta
+++ b/packages/toolchain/meta
@@ -26,8 +26,8 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
 PKG_DEPENDS=""
-#PKG_BUILD_DEPENDS="make xz sed pkg-config autotools gcc-final bison flex cmake jam scons yasm nasm"
-PKG_BUILD_DEPENDS="make xz sed pkg-config autotools gcc-final bison flex cmake scons yasm nasm"
+#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-final bison:host flex cmake scons yasm nasm"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
 PKG_SHORTDESC="toolchain: OpenELEC.tv' toolchain"