diff --git a/sys-devel/bison/bison-2.5.recipe b/sys-devel/bison/bison-2.5.recipe
index fd0151916..2d61f06b9 100644
--- a/sys-devel/bison/bison-2.5.recipe
+++ b/sys-devel/bison/bison-2.5.recipe
@@ -1,33 +1,68 @@
-DESCRIPTION="bison - A yacc-compatible parser generator" 
+SUMMARY="A yacc-compatible parser generator"
+DESCRIPTION="
+	Bison is a general-purpose parser generator that converts an annotated
+	context-free grammar into an LALR(1) or GLR parser for that grammar. Once
+	you are proficient with Bison, you can 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 or
+	C++ programming in order to use Bison.
+	"
 HOMEPAGE="http://www.gnu.org/software/bison/bison.html" 
+COPYRIGHT="1992-2011 Free Software Foundation, Inc."
+LICENSE="GNU GPL v3"
 SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.5.tar.gz"
 CHECKSUM_MD5="687e1dcd29452789d34eaeea4c25abe4"
 REVISION="1"
-STATUS_HAIKU="stable"
-MESSAGE="This port only builds with gcc4. Use 'setgcc gcc4' before building."
-DEPEND=""
+
+ARCHITECTURES="?x86"
+
+PATCHES="${portVersionedName}.patch"
+
+PROVIDES="
+	bison = $portVersion compat >= 2.5
+	cmd:bison = $portVersion compat >= 2.5
+	cmd:yacc
+	devel:liby = $portVersion compat >= 2.5
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	cmd:m4
+	"
+
+BUILD_REQUIRES="
+	"
+
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:gcc
+	cmd:ld
+	cmd:m4
+	cmd:make
+	cmd:sed
+	"
+
 BUILD()
 {
-	cd bison-2.5
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
-		--infodir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/info \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
-		--disable-nls
-	make
+	runConfigure ./configure
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd bison-2.5
 	make install
+
+	prepareInstalledDevelLibs liby
+
+	rm $libDir/charset.alias
+	rmdir $libDir
 }
 
 TEST()
 {
-	cd bison-2.5
 	make check
 }
-
-LICENSE="GNU GPL v3"
-COPYRIGHT="1992-2011 Free Software Foundation, Inc."