diff --git a/dev-libs/libpcre/libpcre-8.33.recipe b/dev-libs/libpcre/libpcre-8.33.recipe
new file mode 100644
index 000000000..73e2cd869
--- /dev/null
+++ b/dev-libs/libpcre/libpcre-8.33.recipe
@@ -0,0 +1,101 @@
+SUMMARY="Perl5 Compatible Regular Expressions"
+DESCRIPTION="
+	The PCRE library is a set of functions that implement regular expression
+	pattern matching using the same syntax and semantics as Perl 5. PCRE has
+	its own native API, as well as a set of wrapper functions that correspond
+	to the POSIX regular expression API. The PCRE library is free, even for
+	building proprietary software.
+	This package contains the native API.
+	"
+HOMEPAGE="http://www.pcre.org/"
+LICENSE="PCRE"
+COPYRIGHT="
+	1997-2011 University of Cambridge
+	2007-2011, Google Inc. All rights reserved.
+	"
+SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.33.tar.bz2"
+CHECKSUM_MD5="21514018448ac10062ece7a668fca949"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86 x86_gcc2"
+
+PROVIDES="
+	libpcre${secondaryArchSuffix} = $portVersion
+	lib:libpcre${secondaryArchSuffix} = 1.2.1 compat >= 1
+	lib:libpcrecpp${secondaryArchSuffix} = 1.2.1 compat >= 1
+	lib:libpcreposix${secondaryArchSuffix} = 1.2.1 compat >= 1
+	"
+
+if [ -z "$secondaryArchSuffix" ];then
+PROVIDES="$PROVIDES
+	cmd:pcregrep = $portVersion compat >= 8
+	cmd:pcretest = $portVersion compat >= 8
+	"
+fi
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	"
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:make
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	"
+
+SOURCE_DIR="pcre-$portVersion"
+
+BUILD()
+{
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake --add-missing
+	runConfigure ./configure \
+		--enable-utf8 \
+		--enable-unicode-properties \
+		--with-pic
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+
+	# prepare develop/lib
+	prepareInstalledDevelLibs libpcre libpcrecpp libpcreposix
+	fixPkgconfig
+
+	# fix pcre-config
+	fixDevelopLibDirReferences $binDir/pcre-config
+
+	# devel package
+	packageEntries devel \
+		$binDir/pcre-config \
+		$developDir \
+		$manDir/man3
+}
+
+TEST()
+{
+	make check
+}
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	libpcre${secondaryArchSuffix}_devel = $portVersion
+	cmd:pcre_config = $portVersion compat >= 8
+	devel:libpcre$secondaryArchSuffix = 1.2.1 compat >= 1
+	devel:libpcrecpp$secondaryArchSuffix = 1.2.1 compat >= 1
+	devel:libpcreposix$secondaryArchSuffix = 1.2.1 compat >= 1
+	"
+REQUIRES_devel="
+	libpcre$secondaryArchSuffix == $portVersion base
+	"
diff --git a/haiku-apps/pe/patches/pe-2.4.3_hg611.patch b/haiku-apps/pe/patches/pe-2.4.3_hg611.patch
new file mode 100644
index 000000000..f4b9b5d4e
--- /dev/null
+++ b/haiku-apps/pe/patches/pe-2.4.3_hg611.patch
@@ -0,0 +1,13 @@
+diff --git a/build/BuildSettings b/build/BuildSettings
+index 3c10281..e9c0c62 100644
+--- a/build/BuildSettings
++++ b/build/BuildSettings
+@@ -43,7 +43,7 @@ if $(OS) = HAIKU {
+ }
+ 
+ # check for pcre...
+-local haveHeadersPcre = [ GLOB /boot/common/develop/headers : pcre.h ] ;
++local haveHeadersPcre = [ GLOB /boot/system/develop/headers : pcre.h ] ;
+ if ! $(haveHeadersPcre) {
+ 	Exit "You need to have pcre installed on your system." ;
+ }
diff --git a/haiku-apps/pe/patches/pe-2.4.3_hg611.patch2 b/haiku-apps/pe/patches/pe-2.4.3_hg611.patch2
new file mode 100644
index 000000000..8829c769c
--- /dev/null
+++ b/haiku-apps/pe/patches/pe-2.4.3_hg611.patch2
@@ -0,0 +1,52 @@
+diff --git a/Extensions/HeaderHeader.cpp b/Extensions/HeaderHeader.cpp
+index 249fc04..1a9c446 100644
+--- a/Extensions/HeaderHeader.cpp
++++ b/Extensions/HeaderHeader.cpp
+@@ -300,7 +300,7 @@ GetSettingsDir(BDirectory &dir, BPath &path)
+ 	//BPath path;
+ 	status_t err;
+ 	// TODO: build list from text files
+-	err = find_directory(B_COMMON_SETTINGS_DIRECTORY, &path, true);
++	err = find_directory(B_SYSTEM_SETTINGS_DIRECTORY, &path, true);
+ 	if (err < B_OK)
+ 		return err;
+ 	dir.SetTo(path.Path());
+diff --git a/Languages/Sources/Lout_Popup.l b/Languages/Sources/Lout_Popup.l
+index 7d3c2db..ede28f4 100644
+--- a/Languages/Sources/Lout_Popup.l
++++ b/Languages/Sources/Lout_Popup.l
+@@ -221,7 +221,7 @@ static status_t GetLoutDirectory(const char* subDir, BPath& path)
+ 
+ 		if (!PathExists(path))
+ 		{
+-			if (find_directory(B_COMMON_ETC_DIRECTORY, &path) == B_OK)
++			if (find_directory(B_SYSTEM_ETC_DIRECTORY, &path) == B_OK)
+ 			{
+ 				path.Append("lout");
+ 				path.Append(subDir);
+diff --git a/Sources/CDoc.cpp b/Sources/CDoc.cpp
+index 002e6c1..75d652a 100644
+--- a/Sources/CDoc.cpp
++++ b/Sources/CDoc.cpp
+@@ -472,7 +472,7 @@ void CDoc::AddRecent(const char *path)
+ 		BPath tp;
+ 		try
+ 		{
+-			FailOSErr(find_directory(B_COMMON_TEMP_DIRECTORY, &tp));
++			FailOSErr(find_directory(B_SYSTEM_TEMP_DIRECTORY, &tp));
+ 			if (strncmp(tp.Path(), path, strlen(tp.Path())) == 0)
+ 				return;
+ 		}
+diff --git a/Sources/CMimeBox.cpp b/Sources/CMimeBox.cpp
+index e9ac4f9..a29a79b 100644
+--- a/Sources/CMimeBox.cpp
++++ b/Sources/CMimeBox.cpp
+@@ -71,7 +71,7 @@ CMimeItem::CMimeItem(const char *mime)
+ 		try
+ 		{
+ 			char p[PATH_MAX];
+-			if (find_directory(B_COMMON_TEMP_DIRECTORY, 0, true, p, PATH_MAX) == B_OK)
++			if (find_directory(B_SYSTEM_TEMP_DIRECTORY, 0, true, p, PATH_MAX) == B_OK)
+ 			{
+ 				BDirectory tmpdir;
+ 				FailOSErr(tmpdir.SetTo(p));
diff --git a/haiku-apps/pe/pe-2.4.3_hg611.recipe b/haiku-apps/pe/pe-2.4.3_hg611.recipe
index 998ad00e6..820b33795 100644
--- a/haiku-apps/pe/pe-2.4.3_hg611.recipe
+++ b/haiku-apps/pe/pe-2.4.3_hg611.recipe
@@ -25,8 +25,8 @@ REQUIRES="
 	lib:libpcreposix
 	"
 BUILD_REQUIRES="
-	devel:libpcre >= 0.0.1
-	devel:libpcreposix >= 0.0.1
+	devel:libpcre >= 1
+	devel:libpcreposix >= 1
 	"
 BUILD_PREREQUIRES="
 	haiku_devel
@@ -43,6 +43,10 @@ USER_SETTINGS_FILES="
 
 SOURCE_DIR="$portVersionedName"
 
+PATCHES="pe-2.4.3_hg611.patch
+		pe-2.4.3_hg611.patch2"
+
+
 BUILD()
 {
 	jam -q