diff --git a/sys-devel/bison/bison-2.4.1.bep b/sys-devel/bison/bison-2.4.1.bep
new file mode 100644
index 000000000..87dbddfdd
--- /dev/null
+++ b/sys-devel/bison/bison-2.4.1.bep
@@ -0,0 +1,17 @@
+DESCRIPTION="bison - A yacc-compatible parser generator" 
+HOMEPAGE="http://www.gnu.org/software/bison/bison.html" 
+SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.4.1.tar.gz"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND=""
+BUILD {
+	cd bison-2.4.1
+	./configure --prefix=/boot/common --disable-nls
+	make
+}
+
+INSTALL {
+	cd bison-2.4.1
+	make install
+	make check
+}
diff --git a/sys-devel/bison/bison-2.4.bep b/sys-devel/bison/bison-2.4.bep
new file mode 100644
index 000000000..b4b03a60e
--- /dev/null
+++ b/sys-devel/bison/bison-2.4.bep
@@ -0,0 +1,17 @@
+DESCRIPTION="bison - A yacc-compatible parser generator" 
+HOMEPAGE="http://www.gnu.org/software/bison/bison.html" 
+SRC_URI="http://ftp.gnu.org/gnu/bison/bison-2.4.tar.gz"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND=""
+BUILD {
+	cd bison-2.4
+	./configure --prefix=/boot/common --disable-nls
+	make
+}
+
+INSTALL {
+	cd bison-2.4
+	make install
+	make check
+}
diff --git a/sys-devel/bison/patches/bison-2.4.1.patch b/sys-devel/bison/patches/bison-2.4.1.patch
new file mode 100644
index 000000000..2e2966269
--- /dev/null
+++ b/sys-devel/bison/patches/bison-2.4.1.patch
@@ -0,0 +1,29 @@
+diff -ur bison-2.4.1.orig/src/location.c bison-2.4.1/src/location.c
+--- bison-2.4.1.orig/src/location.c	2008-08-17 06:15:28.000000000 +0000
++++ bison-2.4.1/src/location.c	2008-11-09 15:03:06.000000000 +0000
+@@ -121,11 +121,11 @@
+   /* Must search in reverse since the file name field may
+    * contain `.' or `:'.  */
+   char *delim = strrchr (loc_str, '.');
+-  aver (delim);
++  aver (delim != NULL);
+   *delim = '\0';
+   bound->column = atoi (delim+1);
+   delim = strrchr (loc_str, ':');
+-  aver (delim);
++  aver (delim != NULL);
+   *delim = '\0';
+   bound->line = atoi (delim+1);
+   bound->file = uniqstr_new (loc_str);
+diff -ur bison-2.4.1.orig/src/muscle_tab.c bison-2.4.1/src/muscle_tab.c
+--- bison-2.4.1.orig/src/muscle_tab.c	2008-08-17 06:15:28.000000000 +0000
++++ bison-2.4.1/src/muscle_tab.c	2008-11-09 15:11:17.000000000 +0000
+@@ -336,7 +336,7 @@
+ {
+   location loc;
+   char const *value = muscle_find_const (key);
+-  aver (value);
++  aver (value != NULL);
+   aver (*value == '[');
+   aver (*++value == '[');
+   while (*++value)
diff --git a/sys-devel/bison/bison-2.4-haiku.diff b/sys-devel/bison/patches/bison-2.4.patch
similarity index 100%
rename from sys-devel/bison/bison-2.4-haiku.diff
rename to sys-devel/bison/patches/bison-2.4.patch