diff --git a/srcpkgs/flex/libfl-devel.template b/srcpkgs/flex/libfl-devel.template
new file mode 100644
index 00000000000..3d3f86d5481
--- /dev/null
+++ b/srcpkgs/flex/libfl-devel.template
@@ -0,0 +1,8 @@
+# Template file for 'libfl-devel'.
+#
+short_desc="${short_desc} -- static library and headers"
+
+do_install() {
+	vmove usr/include usr
+	vmove "usr/lib/*.a" usr/lib
+}
diff --git a/srcpkgs/flex/template b/srcpkgs/flex/template
index c6ee3e1107c..e36874fda96 100644
--- a/srcpkgs/flex/template
+++ b/srcpkgs/flex/template
@@ -1,28 +1,22 @@
 # Template file for 'flex'
 pkgname=flex
 version=2.5.37
-revision=1
+revision=2
 build_style=gnu-configure
+makedepends="help2man"
 fulldepends="bison"
+depends="libfl-devel>=${version}"
+subpackages="libfl-devel"
 short_desc="The Fast Lexical Analyzer"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://flex.sourceforge.net"
 license="BSD"
 distfiles="${SOURCEFORGE_SITE}/flex/${pkgname}-${version}.tar.bz2"
 checksum=17aa7b4ebf19a13bc2dff4115b416365c95f090061539a932a68092349ac052a
-long_desc="
- Flex is a tool for generating scanners. A scanner, sometimes called a
- tokenizer, is a program which recognizes lexical patterns in text.
 
- The flex program reads user-specified input files, or its standard input
- if no file names are given, for a description of a scanner to generate.
-
- The description is in the form of pairs of regular expressions and C code,
- called rules. Flex generates a C source file named, "lex.yy.c", which
- defines the function yylex(). The file "lex.yy.c" can be compiled and
- linked to produce an executable. When the executable is run, it analyzes
- its input for occurrences of text matching the regular expressions for each
- rule. Whenever it finds a match, it executes the corresponding C code."
+pre_install() {
+	sed -i "s|.SUFFIXES: .dvi .html .info .pdf .ps .texi|.SUFFIXES: .info .texi|g" doc/Makefile
+}
 
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/flex
diff --git a/srcpkgs/libfl-devel b/srcpkgs/libfl-devel
new file mode 120000
index 00000000000..3110bed486e
--- /dev/null
+++ b/srcpkgs/libfl-devel
@@ -0,0 +1 @@
+flex
\ No newline at end of file