diff --git a/packages/devel/binutils/package.mk b/packages/devel/binutils/package.mk
index 7f6783b81e..28ee26727b 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 linux:host gmp:host mpfr cloog ppl:host"
+PKG_BUILD_DEPENDS_HOST="ccache:host bison:host flex:flex linux:host 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/devel/flex/meta b/packages/devel/flex/package.mk
similarity index 84%
rename from packages/toolchain/devel/flex/meta
rename to packages/devel/flex/package.mk
index 4bd8f76bd5..be6b21577d 100644
--- a/packages/toolchain/devel/flex/meta
+++ b/packages/devel/flex/package.mk
@@ -23,12 +23,23 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://flex.sourceforge.net/"
 PKG_URL="$SOURCEFORGE_SRC/flex/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="ccache:host"
+PKG_DEPENDS_HOST=""
+PKG_BUILD_DEPENDS_HOST="ccache:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
 PKG_SHORTDESC="flex: Fast lexical analyzer generator"
 PKG_LONGDESC="flex is a tool for generating programs that perform pattern-matching on text."
-PKG_IS_ADDON="no"
 
+PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
+
+PKG_CONFIGURE_OPTS_HOST="--disable-rpath --with-gnu-ld"
+
+post_makeinstall_host() {
+  cat > $ROOT/$TOOLCHAIN/bin/lex << "EOF"
+#!/bin/sh
+exec flex "$@"
+EOF
+
+  chmod -v 755 $ROOT/$TOOLCHAIN/bin/lex
+}
diff --git a/packages/toolchain/devel/flex/build b/packages/toolchain/devel/flex/build
deleted file mode 100755
index 515654521c..0000000000
--- a/packages/toolchain/devel/flex/build
+++ /dev/null
@@ -1,41 +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
-./configure --host=$HOST_NAME \
-            --build=$HOST_NAME \
-            --prefix=$ROOT/$TOOLCHAIN \
-            --enable-shared \
-            --disable-static \
-            --disable-rpath \
-            --with-gnu-ld
-
-make
-make install
-
-cat > $ROOT/$TOOLCHAIN/bin/lex << "EOF"
-#!/bin/sh
-exec flex "$@"
-EOF
-chmod -v 755 $ROOT/$TOOLCHAIN/bin/lex
diff --git a/packages/toolchain/meta b/packages/toolchain/meta
index 872a77b4e1..a0c102c9b1 100644
--- a/packages/toolchain/meta
+++ b/packages/toolchain/meta
@@ -24,7 +24,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="make:host xz:host sed:host pkg-config autotools gcc:host bison:host flex cmake:host scons yasm nasm"
+PKG_BUILD_DEPENDS="make:host xz:host sed:host pkg-config autotools gcc:host bison:host flex:host cmake:host scons yasm nasm"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
 PKG_SHORTDESC="toolchain: OpenELEC.tv' toolchain"