diff --git a/dev-util/pjdfstest/patches/pjdfstest-20100807.patch b/dev-util/pjdfstest/patches/pjdfstest-20100807.patch
new file mode 100644
index 000000000..8546097d1
--- /dev/null
+++ b/dev-util/pjdfstest/patches/pjdfstest-20100807.patch
@@ -0,0 +1,37 @@
+diff -urN pjdfstest-20100807/Makefile pjdfstest-20100807-haiku/Makefile
+--- pjdfstest-20100807/Makefile	2010-08-06 17:38:26.008912896 +0000
++++ pjdfstest-20100807-haiku/Makefile	2010-11-05 16:31:34.000524288 +0000
+@@ -17,6 +17,10 @@
+ CFLAGS+= -D__OS_Darwin__
+ CFLAGS+= -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_LCHFLAGS
+ 
++.elif ${OSTYPE} == "Haiku"
++CFLAGS+= -D__OS_Haiku__
++CFLAGS+= -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_LCHFLAGS
++
+ .elif ${OSTYPE} == "Linux"
+ CFLAGS+= -D__OS_Linux__
+ CFLAGS+= -D_GNU_SOURCE
+diff -urN pjdfstest-20100807/tests/conf pjdfstest-20100807-haiku/tests/conf
+--- pjdfstest-20100807/tests/conf	2010-08-06 21:53:43.009961472 +0000
++++ pjdfstest-20100807-haiku/tests/conf	2010-11-05 16:44:11.000000000 +0000
+@@ -1,7 +1,7 @@
+ # $FreeBSD: head/tools/regression/fstest/tests/conf 210970 2010-08-06 21:53:50Z pjd $
+ # fstest configuration file
+ 
+-# Known operating systems: FreeBSD, SunOS, Linux
++# Known operating systems: FreeBSD, SunOS, Linux, Haiku
+ os=`uname`
+ 
+ case "${os}" in
+@@ -17,6 +17,10 @@
+ 	fs=`mount -v | egrep "^${pattern}" | awk '{print $5}' | \
+ 	    tr -s '[:lower:]' '[:upper:]'`
+ 	;;
++Haiku)
++	GREP=grep
++	fs=`df -b | tail -1 | awk '{print toupper($2)}'`
++	;;	
+ Linux)
+ 	GREP=grep
+ 	fs=`df -PT . | tail -1 | awk '{print toupper($2)}'`
diff --git a/dev-util/pjdfstest/pjdfstest-20100807.bep b/dev-util/pjdfstest/pjdfstest-20100807.bep
new file mode 100644
index 000000000..878545588
--- /dev/null
+++ b/dev-util/pjdfstest/pjdfstest-20100807.bep
@@ -0,0 +1,25 @@
+DESCRIPTION="FreeBSD's POSIX Test Suite" 
+HOMEPAGE="http://people.freebsd.org/~pjd/pjdfstest" 
+SRC_URI="http://people.freebsd.org/~pjd/pjdfstest/pjdfstest-20100807.tbz"
+CHECKSUM_MD5="2ea67f0ea6f8f028345b604cfddaf1aa"
+REVISION="1"
+STATUS_HAIKU="broken"
+MESSAGE="This test suite requires expect, which hasn't been ported to Haiku, yet."
+DEPEND=""
+BUILD {
+	cd pjdfstest-20100807
+	make
+}
+
+INSTALL {
+	cd pjdfstest-20100807
+
+}
+
+TEST {
+	cd pjdfstest-20100807
+
+}
+
+LICENSE="BSD (2-clause)"
+COPYRIGHT="2006-2007 Pawel Jakub Dawidek"