diff --git a/app-arch/bzip2/bzip2-1.0.6.recipe b/app-arch/bzip2/bzip2-1.0.6.recipe
index 9a16b40a6..91a5c4471 100644
--- a/app-arch/bzip2/bzip2-1.0.6.recipe
+++ b/app-arch/bzip2/bzip2-1.0.6.recipe
@@ -7,9 +7,15 @@ SRC_URI="http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz"
 CHECKSUM_MD5="00b516f4704d4a7cb50a1d97e6e8e15b"
 REVISION="4"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86 x86_gcc2"
 
 PROVIDES="
-	bzip2 = $portVersion compat >= 1
+	bzip2$secondaryArchSuffix = $portVersion compat >= 1
+	lib:libbz2$secondaryArchSuffix = $portVersion compat >= 1.0
+	"
+
+if [ -z "$secondaryArchSuffix" ]; then
+PROVIDES="$PROVIDES
 	cmd:bzcat = $portVersion compat >= 1
 	cmd:bzcmp = $portVersion compat >= 1
 	cmd:bzdiff = $portVersion compat >= 1
@@ -21,23 +27,24 @@ PROVIDES="
 	cmd:bzless = $portVersion compat >= 1
 	cmd:bzmore = $portVersion compat >= 1
 	cmd:bunzip2 = $portVersion compat >= 1
-	lib:libbz2 = $portVersion compat >= 1.0
 	"
+fi
+
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"
 BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:ar
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:sed
 	"
 
-SOURCE_DIR="$portVersionedName"
+#SOURCE_DIR="$portVersionedName"
 
 BUILD()
 {
@@ -50,6 +57,7 @@ INSTALL()
 {
 	make install PREFIX=$prefix
 
+	mkdir -p $libDir
 	# also install shared lib
 	cp -a libbz2.so.1.0.6 libbz2.so.1.0 $libDir
 
@@ -75,9 +83,9 @@ INSTALL()
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
-	bzip2_devel = $portVersion compat >= 1
-	devel:libbz2 = $portVersion compat >= 1.0
+	bzip2${secondaryArchSuffix}_devel = $portVersion compat >= 1
+	devel:libbz2$secondaryArchSuffix = $portVersion compat >= 1.0
 	"
 REQUIRES_devel="
-	bzip2 == $portVersion base
+	bzip2$secondaryArchSuffix == $portVersion base
 	"