diff --git a/dev-libs/libevent/libevent-1.4.14b.recipe b/dev-libs/libevent/libevent-1.4.14b.recipe
index 91c655a79..d26571f16 100644
--- a/dev-libs/libevent/libevent-1.4.14b.recipe
+++ b/dev-libs/libevent/libevent-1.4.14b.recipe
@@ -1,27 +1,101 @@
-DESCRIPTION="Libevent"
-HOMEPAGE="http://monkey.org/~provos/libevent/"
+SUMMARY="Libevent - an event notification library"
+DESCRIPTION="The libevent API provides a mechanism to execute a callback function when a specific event occurs on a file descriptor or after a timeout has been reached. Furthermore, libevent also support callbacks due to signals or regular timeouts.
+libevent is meant to replace the event loop found in event driven network servers. An application just needs to call event_dispatch() and then add or remove events dynamically without having to change the event loop."
+HOMEPAGE="http://www.libevent.org/"
 SRC_URI="http://monkey.org/~provos/libevent-1.4.14b-stable.tar.gz"
 CHECKSUM_MD5="a00e037e4d3f9e4fe9893e8a2d27918c"
+LICENSE="BSD (3-clause)"
+COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors."
+
 REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+
+ARCHITECTURES="?x86_gcc2 ?x86"
+
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+
+PROVIDES="
+	cmd:event_rpcgen.py
+	lib:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
+	lib:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
+	lib:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libnetwork$secondaryArchSuffix >= $haikuVersion
+	lib:libssl$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libnetwork >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	devel:libz
+	"
+
+BUILD_PREREQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize
+	cmd:make
+	"
+SOURCE_DIR="$portVersionedName-stable"
+
+PATCHES="libevent-1.4.14b.patch"
 
 BUILD()
 {
-	cd libevent-1.4.14b-stable
-	autoreconf -vfi
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man
-	LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
-		--libdir=$LIBDIR \
-		--mandir=$COMMON_DOCS
-	make
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in
+	sed -i 's/TESTS = $(top_srcdir)/TESTS = {$sourceDir}/g' test/Makefile.am
+
+	libtoolize --force --copy --install
+	aclocal
+	autoconf
+	automake --add-missing
+	runConfigure ./configure
+	make $jobArgs
 }
 
 INSTALL()
 {
-	cd libevent-1.4.14b-stable
 	make install
+	prepareInstalledDevelLibs \
+		libevent_1.4 \
+		libevent_core_1.4 \
+		libevent_extra_1.4
+
+	mv .libs/libevent.*
+		.libs/libevent_core.* \
+		.libs/libevent_extra.* \
+		$developLibDir
+		
+	mv .libs/libevent_1.4.*
+		.libs/libevent_core_1.4.* \
+		.libs/libevent_extra_1.4.* \
+		$developLibDir
+	fixPkgconfig
+
+	# devel package
+	packageEntries devel \
+		$developDir
 }
-LICENSE="BSD (3-clause)"
-COPYRIGHT="2000-2007 Niels Provos, 2005 Nick Mathewson, and other contributors."
+
+# ----- devel package -------------------------------------------------------
+
+PROVIDES_devel="
+	cmd:event_rpcgen.py
+#	lib:libevent_1.4$secondaryArchSuffix = $portVersion
+#	lib:libevent_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
+	lib:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
+	lib:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
+#	devel:libevent_1.4$secondaryArchSuffix >= 2.2.0 compat >= 2
+	devel:libevent_core_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
+	devel:libevent_extra_1.4$secondaryArchSuffix = 2.2.0 compat >= 2
+	devel:libevent_core$secondaryArchSuffix = 2.2.0 compat >= 2
+	devel:libevent_extra$secondaryArchSuffix = 2.2.0 compat >= 2
+	"
+
+REQUIRES_devel="
+	libevent$secondaryArchSuffix  == $portVersion base
+	"