diff --git a/packages/devel/flex/build b/packages/toolchain/devel/flex/build
similarity index 81%
rename from packages/devel/flex/build
rename to packages/toolchain/devel/flex/build
index 091c469203..1c311f497a 100755
--- a/packages/devel/flex/build
+++ b/packages/toolchain/devel/flex/build
@@ -22,18 +22,22 @@
 
 . config/options $1
 
+setup_toolchain host
+
 cd $PKG_BUILD
-ac_cv_func_malloc_0_nonnull=yes \
-ac_cv_func_realloc_0_nonnull=yes \
-./configure --host=$TARGET_NAME \
+./configure --host=$HOST_NAME \
             --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --datadir=/usr/share \
-            --localstatedir=/var \
-            --disable-static \
+            --prefix=$ROOT/$TOOLCHAIN \
             --enable-shared \
+            --disable-static \
+            --disable-rpath \
+            --with-gnu-ld
 
 make
+make install
 
-$MAKEINSTALL
+cat > $ROOT/$TOOLCHAIN/bin/lex << "EOF"
+#!/bin/sh
+exec flex -l "$@"
+EOF
+chmod -v 755 $ROOT/$TOOLCHAIN/bin/lex
\ No newline at end of file
diff --git a/packages/devel/flex/meta b/packages/toolchain/devel/flex/meta
similarity index 89%
rename from packages/devel/flex/meta
rename to packages/toolchain/devel/flex/meta
index 2311b5e7b1..d2a84abe35 100644
--- a/packages/devel/flex/meta
+++ b/packages/toolchain/devel/flex/meta
@@ -24,13 +24,13 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://flex.sourceforge.net/"
-PKG_URL="$SOURCEFORGE_SRC/flex/flex/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://prdownloads.sourceforge.net/flex/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
+PKG_BUILD_DEPENDS="ccache"
 PKG_PRIORITY="optional"
-PKG_SECTION="devel"
+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_AUTORECONF="yes"
+PKG_AUTORECONF="no"
diff --git a/packages/toolchain/meta b/packages/toolchain/meta
index 629e58bf54..e14bcd37c5 100644
--- a/packages/toolchain/meta
+++ b/packages/toolchain/meta
@@ -26,7 +26,7 @@ PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
 PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="make sed pkg-config automake autoconf intltool gcc-final cmake jam yasm nasm"
+PKG_BUILD_DEPENDS="make sed pkg-config automake autoconf intltool gcc-final flex cmake jam yasm nasm"
 PKG_PRIORITY="optional"
 PKG_SECTION="toolchain/devel"
 PKG_SHORTDESC="toolchain: OpenELEC.tv' toolchain"