diff --git a/haiku-apps/pe/patches/pe-2.4.3_hg602.patchset b/haiku-apps/pe/patches/pe-2.4.3_adjustments_for_pm.patchset
similarity index 100%
rename from haiku-apps/pe/patches/pe-2.4.3_hg602.patchset
rename to haiku-apps/pe/patches/pe-2.4.3_adjustments_for_pm.patchset
diff --git a/haiku-apps/pe/pe-2.4.3_hg602.recipe b/haiku-apps/pe/pe-2.4.3_hg602.recipe
index 1fd231bfc..12c5e075b 100644
--- a/haiku-apps/pe/pe-2.4.3_hg602.recipe
+++ b/haiku-apps/pe/pe-2.4.3_hg602.recipe
@@ -1,6 +1,6 @@
-SUMMARY="A programmer's editor" 
-DESCRIPTION="A programmer's editor" 
-HOMEPAGE="http://pe-editor.berlios.de/" 
+SUMMARY="A programmer's editor"
+DESCRIPTION="A programmer's editor"
+HOMEPAGE="http://pe-editor.berlios.de/"
 LICENSE="
 	BSD (4-clause)
 	MIT
@@ -13,7 +13,7 @@ SRC_URI="hg+http://hg.berlios.de/repos/pe-editor#602"
 REVISION="5"
 ARCHITECTURES="x86_gcc2 x86"
 
-PATCHES="pe-2.4.3_hg602.patchset"
+PATCHES="pe-2.4.3_adjustments_for_pm.patchset"
 
 PROVIDES="
 	pe = $portVersion
@@ -58,7 +58,7 @@ INSTALL()
 	mkdir -p $appsDir
 	cp -a generated/distro $peDir
 	cp -a doc $peDir/Documentation
-	
+
 	mkdir $binDir
 	ln -sfn $peDir/lpe $binDir
 
diff --git a/haiku-apps/pe/pe-2.4.3_hg606.recipe b/haiku-apps/pe/pe-2.4.3_hg606.recipe
new file mode 100644
index 000000000..3b8507d15
--- /dev/null
+++ b/haiku-apps/pe/pe-2.4.3_hg606.recipe
@@ -0,0 +1,66 @@
+SUMMARY="A programmer's editor"
+DESCRIPTION="A programmer's editor"
+HOMEPAGE="http://pe-editor.berlios.de/"
+LICENSE="
+	BSD (4-clause)
+	MIT
+	"
+COPYRIGHT="
+	1996-2002 Maarteen Hekkelman
+	2003-2013 Team Pe
+	"
+SRC_URI="hg+http://hg.berlios.de/repos/pe-editor#606"
+REVISION="1"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+
+PATCHES="pe-2.4.3_adjustments_for_pm.patchset"
+
+PROVIDES="
+	pe = $portVersion
+	cmd:Pe = $portVersion compat >= 2
+	cmd:lpe = $portVersion compat >= 2
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	lib:libpcre
+	lib:libpcreposix
+	"
+BUILD_REQUIRES="
+	devel:libpcre >= 0.0.1
+	devel:libpcreposix >= 0.0.1
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	cmd:bison
+	cmd:flex
+	cmd:gcc
+	cmd:jam
+	cmd:ld
+	"
+
+USER_SETTINGS_FILES="
+	settings/pe directory
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+BUILD()
+{
+	jam -q
+		# multi-job builds don't work reliably
+}
+
+INSTALL()
+{
+	peDir=$appsDir/Pe
+
+	mkdir -p $appsDir
+	cp -a generated/distro $peDir
+	cp -a doc $peDir/Documentation
+
+	mkdir $binDir
+	ln -sfn $peDir/lpe $binDir
+
+	addAppDeskbarSymlink $peDir/Pe
+}