diff --git a/dev-libs/libpcre/libpcre-8.21.recipe b/dev-libs/libpcre/libpcre-8.21.recipe
index f1f33acba..73800f980 100644
--- a/dev-libs/libpcre/libpcre-8.21.recipe
+++ b/dev-libs/libpcre/libpcre-8.21.recipe
@@ -1,33 +1,67 @@
-DESCRIPTION="libpcre - Perl Compatible Regular Expressions"
+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.21.tar.bz2"
 CHECKSUM_MD5="0a7b592bea64b7aa7f4011fc7171a730"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
+REVISION="2"
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PROVIDES="
+	libpcre = $portVersion
+	lib:libpcre = $portVersion compat >= 8
+	"
+
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc
+	cmd:make
+	cmd:ld
+	cmd:libtoolize
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+SOURCE_DIR="pcre-$portVersion"
+
 BUILD()
 {
-	cd pcre-8.21
-    LIBDIR=`finddir B_COMMON_LIB_DIRECTORY`
+	automake --add-missing
 	libtoolize --force --copy --install
 	aclocal
 	autoconf
 	automake
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
+	./configure $configureDirArgs \
 		--enable-utf8 \
 		--enable-unicode-properties \
-		--with-pic \
-		--libdir=${LIBDIR} \
-		--mandir=$COMMON_DOCS/man \
-		--docdir=$COMMON_DOCS/doc/pcre
+		--with-pic
 	make
 }
 
 INSTALL()
 {
-	cd pcre-8.21
 	make install
+	
+	# prepare develop/lib
+	prepareInstalledDevelLibs libpcre libpcrecpp libpcreposix
+	fixPkgconfig
 }
 
 TEST()
@@ -35,7 +69,3 @@ TEST()
 	cd pcre-8.21
 	make check
 }
-
-LICENSE="PCRE"
-COPYRIGHT="1997-2011 University of Cambridge
-	2007-2011, Google Inc. All rights reserved."