diff --git a/dev-libs/libedit/libedit-20120601-3.0.recipe b/dev-libs/libedit/libedit-20120601-3.0.recipe
deleted file mode 100644
index e2482729a..000000000
--- a/dev-libs/libedit/libedit-20120601-3.0.recipe
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION="A BSD licensed replacement for the GNU readline library." 
-HOMEPAGE="http://www.thrysoee.dk/editline/" 
-SRC_URI="http://www.thrysoee.dk/editline/libedit-20120601-3.0.tar.gz"
-CHECKSUM_MD5="e50f6a7afb4de00c81650f7b1a0f5aea"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-LICENSE="BSD (3-clause)"
-COPYRIGHT="1992-2012 The NetBSD Foundation, Inc."
-BUILD()
-{
-	cd libedit-20120601-3.0
-	autoreconf --force --install
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--disable-shared \
-		--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
-	make
-}
-
-INSTALL()
-{
-	cd libedit-20120601-3.0
-	make install
-}
diff --git a/dev-libs/libedit/libedit-20120601_3.0.recipe b/dev-libs/libedit/libedit-20120601_3.0.recipe
new file mode 100644
index 000000000..3afddae89
--- /dev/null
+++ b/dev-libs/libedit/libedit-20120601_3.0.recipe
@@ -0,0 +1,49 @@
+SUMMARY="A BSD licensed replacement for the GNU readline library" 
+DESCRIPTION="This is an autotool- and libtoolized port of the NetBSD Editline library (libedit). This Berkeley-style licensed command line editor library provides generic line editing, history, and tokenization functions, similar to those found in GNU Readline."
+LICENSE="BSD (3-clause)"
+COPYRIGHT="1992-2012 The NetBSD Foundation, Inc."
+HOMEPAGE="http://www.thrysoee.dk/editline/" 
+SRC_URI="http://www.thrysoee.dk/editline/libedit-20120601-3.0.tar.gz"
+CHECKSUM_MD5="e50f6a7afb4de00c81650f7b1a0f5aea"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PATCHES="libedit-20120601_3.0.patch"
+
+PROVIDES="
+	libedit = $portVersion
+	lib:libedit = 0.0.41 compat >= 0
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	ncurses
+	"
+BUILD_REQUIRES="
+	$REQUIRES
+	cmd:aclocal
+	cmd:autoreconf
+	cmd:gcc
+	cmd:ld
+	cmd:libtoolize
+	cmd:make
+	cmd:sed
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+SOURCE_DIR="libedit-20120601-3.0"
+
+BUILD()
+{
+	autoreconf --force --install
+	runConfigure ./configure
+	make
+}
+
+INSTALL()
+{
+	make install
+	prepareInstalledDevelLibs libedit
+	fixPkgconfig
+}
diff --git a/dev-libs/libedit/patches/libedit-20120601-3.0.patch b/dev-libs/libedit/patches/libedit-20120601_3.0.patch
similarity index 84%
rename from dev-libs/libedit/patches/libedit-20120601-3.0.patch
rename to dev-libs/libedit/patches/libedit-20120601_3.0.patch
index 6c2bae550..ffecf61f4 100644
--- a/dev-libs/libedit/patches/libedit-20120601-3.0.patch
+++ b/dev-libs/libedit/patches/libedit-20120601_3.0.patch
@@ -37,19 +37,6 @@ diff -urN libedit-20120601-3.0/src/editline/readline.h libedit-20120601-3.0-haik
  #include <sys/ttydefaults.h>
  #endif
  #ifndef CTRL
-diff -urN libedit-20120601-3.0/src/el.c libedit-20120601-3.0-haiku/src/el.c
---- libedit-20120601-3.0/src/el.c	2012-03-11 15:00:23.000000000 -0700
-+++ libedit-20120601-3.0-haiku/src/el.c	2012-06-16 15:01:11.013893632 -0700
-@@ -55,7 +55,9 @@
- #include <stdarg.h>
- #include <ctype.h>
- #include <locale.h>
-+#ifdef HAVE_LANGINFO_H
- #include <langinfo.h>
-+#endif
- #include "el.h"
- 
- /* el_init():
 diff -urN libedit-20120601-3.0/src/vis.c libedit-20120601-3.0-haiku/src/vis.c
 --- libedit-20120601-3.0/src/vis.c	2011-07-08 23:39:42.000000000 -0700
 +++ libedit-20120601-3.0-haiku/src/vis.c	2012-06-16 15:01:11.063176704 -0700