diff --git a/dev-libs/libpcre/libpcre-8.21.recipe b/dev-libs/libpcre/libpcre-8.21.recipe
index 2a0093640..6d1a52f71 100644
--- a/dev-libs/libpcre/libpcre-8.21.recipe
+++ b/dev-libs/libpcre/libpcre-8.21.recipe
@@ -17,29 +17,35 @@ SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.21.tar.bz2
 CHECKSUM_MD5="0a7b592bea64b7aa7f4011fc7171a730"
 REVISION="5"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 
 PROVIDES="
-	libpcre = $portVersion
-	cmd:pcregrep = $portVersion compat >= 8
-	cmd:pcretest = $portVersion compat >= 8
-	lib:libpcre = 0.0.1 compat >= 0
-	lib:libpcrecpp = 0.0.1 compat >= 0
-	lib:libpcreposix = 0.0.1 compat >= 0
+	libpcre${secondaryArchSuffix} = $portVersion
+	lib:libpcre${secondaryArchSuffix} = 0.0.1 compat >= 0
+	lib:libpcrecpp${secondaryArchSuffix} = 0.0.1 compat >= 0
+	lib:libpcreposix${secondaryArchSuffix} = 0.0.1 compat >= 0
 	"
 
+if [ -z "$secondaryArchSuffix" ];then
+PROVIDES="$PROVIDES
+	cmd:pcregrep = $portVersion compat >= 8
+	cmd:pcretest = $portVersion compat >= 8
+	"
+fi
+
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:make
-	cmd:ld
+	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	"
 
@@ -84,12 +90,12 @@ TEST()
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
-	libpcre_devel = $portVersion
+	libpcre${secondaryArchSuffix}_devel = $portVersion
 	cmd:pcre_config = $portVersion compat >= 8
-	devel:libpcre = 0.0.1 compat >= 0
-	devel:libpcrecpp = 0.0.1 compat >= 0
-	devel:libpcreposix = 0.0.1 compat >= 0
+	devel:libpcre$secondaryArchSuffix = 0.0.1 compat >= 0
+	devel:libpcrecpp$secondaryArchSuffix = 0.0.1 compat >= 0
+	devel:libpcreposix$secondaryArchSuffix = 0.0.1 compat >= 0
 	"
 REQUIRES_devel="
-	libpcre == $portVersion base
+	libpcre$secondaryArchSuffix == $portVersion base
 	"