diff --git a/sys-devel/m4/m4-1.4.15.bep b/sys-devel/m4/m4-1.4.15.bep
new file mode 100644
index 000000000..090c3519d
--- /dev/null
+++ b/sys-devel/m4/m4-1.4.15.bep
@@ -0,0 +1,19 @@
+DESCRIPTION="m4 - GNU macro processor" 
+HOMEPAGE="http://www.gnu.org/software/m4/" 
+SRC_URI="http://ftp.gnu.org/gnu/m4/m4-1.4.15.tar.gz"
+CHECKSUM_MD5="5649a2e593b6c639deae9e72ede777dd"
+REVISION="1"
+STATUS_HAIKU="broken"
+DEPEND=""
+BUILD {
+	cd m4-1.4.15
+	./configure --prefix=/boot/common --enable-changeword
+	make
+}
+INSTALL {
+	cd m4-1.4.15
+	make install
+#	make check
+}
+LICENSE="GNU GPL v3"
+COPYRIGHT="2000, 2005-2010 Free Software Foundation, Inc."
diff --git a/sys-devel/m4/patches/m4-1.4.15.patch b/sys-devel/m4/patches/m4-1.4.15.patch
new file mode 100644
index 000000000..5105676ab
--- /dev/null
+++ b/sys-devel/m4/patches/m4-1.4.15.patch
@@ -0,0 +1,15 @@
+diff -urN m4-1.4.15/lib/pipe2.c m4-1.4.15-haiku/lib/pipe2.c
+--- m4-1.4.15/lib/pipe2.c	2010-01-28 13:04:07.051118080 +0000
++++ m4-1.4.15-haiku/lib/pipe2.c	2010-02-27 20:00:33.547094528 +0000
+@@ -78,7 +78,11 @@
+ /* Unix API.  */
+ 
+   /* Check the supported flags.  */
++#if (defined __BEOS__ || defined __HAIKU__)
++  if ((flags & ~(O_CLOEXEC | O_NONBLOCK)) != 0)
++#else
+   if ((flags & ~(O_CLOEXEC | O_NONBLOCK | O_TEXT | O_BINARY)) != 0)
++#endif
+     {
+       errno = EINVAL;
+       return -1;