diff --git a/dev-libs/libevent/libevent-2.0.21.recipe b/dev-libs/libevent/libevent-2.0.21.recipe
index 86dbf3a6d..383df5c7f 100644
--- a/dev-libs/libevent/libevent-2.0.21.recipe
+++ b/dev-libs/libevent/libevent-2.0.21.recipe
@@ -15,25 +15,31 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	cmd:event_rpcgen.py
-	libevent$secondaryArchSuffix = $portVersion
-	lib:libevent$secondaryArchSuffix = 2.0.0 compat >= 2
-	lib:libevent_2.0 = 5 compat >= 5
-	lib:libevent_2.0 = 5.1.9 compat >= 5
-	lib:libevent_core_2.0 = 5 compat >= 5
-	lib:libevent_core_2.0 = 5.1.9 compat >= 5
-	lib:libevent_core
-	lib:libevent_extra_2.0 = 5 compat >= 5
-	lib:libevent_extra_2.0 = 5.1.9 compat >= 5
-	lib:libevent_extra
-	lib:libevent_pthreads_2.0 = 5 compat >= 5
-	lib:libevent_pthreads_2.0 = 5.1.9 compat >= 5
-	lib:libevent_pthreads
+#	lib:libevent$secondaryArchSuffix >= 2.0_5.1.9 compat >= 2.0_5
+#	lib:libevent$secondaryArchSuffix >= 5.1.9 compat >= 5
+	lib:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	lib:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	lib:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	lib:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	lib:libevent_openssl_2.0$secondaryArchSuffix= 5.1.9 compat >= 5
+	lib:libevent_core$secondaryArchSuffix = 5.1.9 compat >= 5
+	lib:libevent_extra$secondaryArchSuffix = 5.1.9 compat >= 5
+	lib:libevent_pthreads$secondaryArchSuffix = 5.1.9 compat >= 5
+	lib:libevent_openssl$secondaryArchSuffix= 5.1.9 compat >= 5
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libnetwork$secondaryArchSuffix >= $haikuVersion
+	lib:libssl$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libnetwork >= $haikuVersion
 	"
 BUILD_REQUIRES="
+	devel:libssl$secondaryArchSuffix
+	devel:libcrypto$secondaryArchSuffix
+	devel:libz
 	"
+
 BUILD_PREREQUIRES="
 	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:aclocal
@@ -46,14 +52,13 @@ BUILD_PREREQUIRES="
 	"
 SOURCE_DIR="$portVersionedName-stable"
 
-PATCH()
-{
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.in
-	sed -i 's/TESTS = $(top_srcdir)/TESTS = {$sourceDir}/g' test/Makefile.am
-}
+PATCHES="libevent-2.0.21.patch"
 
 BUILD()
 {
+	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
@@ -65,11 +70,20 @@ BUILD()
 INSTALL()
 {
 	make install
-	prepareInstalledDevelLibs libevent
+	prepareInstalledDevelLibs \
+		libevent \
+		libevent_core \
+		libevent_extra \
+		libevent_pthreads \
+		libevent_openssl
+
+	mv .libs/libevent_core.* \
+		.libs/libevent_extra.* \
+		.libs/libevent_pthreads.* \
+		.libs/libevent_openssl.* \
+		$developLibDir
 	fixPkgconfig
 
-	
-	ls
 	# devel package
 	packageEntries devel \
 		$developDir
@@ -78,15 +92,27 @@ INSTALL()
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
-	libevent_devel = $portVersion compat >= 2
-	devel:libevent = $portVersion compat >= 2
-	devel:libevent_core.a = 5 compat >= 5
-	devel:libevent_core.la = 5.1.9 compat >= 5
-	devel:libevent_extra.a = 5 compat >= 5
-	devel:libevent_extra.la = 5.1.9 compat >= 5
-	devel:libevent_pthreads.a = 5 compat >= 5
-	devel:libevent_pthreads.la = 5.1.9 compat >= 5
+	cmd:event_rpcgen.py
+	lib:libevent$secondaryArchSuffix = $portVersion
+	lib:libevent_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	lib:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	lib:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	lib:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	lib:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+##	devel:libevent$secondaryArchSuffix >= 2.0_5.1.9 compat >= 2.0_5
+##	devel:libevent$secondaryArchSuffix >= 5.1.9 compat >= 5
+	devel:libevent_core_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_extra_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_pthreads_2.0$secondaryArchSuffix = 5.1.9 compat >= 5	
+	devel:libevent_openssl_2.0$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_core$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_extra$secondaryArchSuffix = 5.1.9 compat >= 5
+	devel:libevent_pthreads$secondaryArchSuffix = 5.1.9 compat >= 5	
+	devel:libevent_openssl$secondaryArchSuffix = 5.1.9 compat >= 5
 	"
+
 REQUIRES_devel="
-	libevent == $portVersion base
+	libevent$secondaryArchSuffix  == $portVersion base
+	devel:libssl
+	devel:libcrypto
 	"