diff --git a/dev-libs/libxml2/libxml2-2.8.0.recipe b/dev-libs/libxml2/libxml2-2.8.0.recipe
index e59ff9df8..0272327e2 100644
--- a/dev-libs/libxml2/libxml2-2.8.0.recipe
+++ b/dev-libs/libxml2/libxml2-2.8.0.recipe
@@ -4,37 +4,41 @@ LICENSE="MIT"
 COPYRIGHT="1998-2003 Daniel Veillard.  All Rights Reserved."
 SRC_URI="ftp://xmlsoft.org/libxml2/libxml2-2.8.0.tar.gz"
 CHECKSUM_MD5="c62106f02ee00b6437f0fb9d370c1093"
-REVISION="3"
-ARCHITECTURES="x86_gcc2 ?x86"
+REVISION="4"
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="libxml2-2.8.0.patch"
 
 PROVIDES="
-	libxml2 = $portVersion compat >= 2
-	cmd:xmlcatalog = $portVersion compat >= 2
-	cmd:xmllint = $portVersion compat >= 2
-	lib:libxml2 = $portVersion compat >= 2
+	libxml2$secondaryArchSuffix = $portVersion compat >= 2
+	lib:libxml2$secondaryArchSuffix = $portVersion compat >= 2
 	"
+if [ -z "$secondaryArchSuffix" ]; then
+	PROVIDES="$PROVIDES
+		cmd:xmlcatalog = $portVersion compat >= 2
+		cmd:xmllint = $portVersion compat >= 2
+		"
+fi
+
 REQUIRES="
-	haiku >= $haikuVersion
-	lib:libz
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	devel:libz
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
 	cmd:automake
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
 	"
 
-SOURCE_DIR="$portVersionedName"
-
 PATCH()
 {
 	# replace hard-coded references to the development documentation dir
@@ -74,6 +78,12 @@ INSTALL()
 		$docDir \
 		$manDir/man1/xml2-config.1 \
 		$manDir/man3
+
+	# Remove stuff we don't need in the secondary architecture base package.
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $binDir
+		rm -rf $documentationDir
+	fi
 }
 
 TEST()
@@ -138,10 +148,10 @@ DESCRIPTION="
 # ----- devel package -------------------------------------------------------
 
 PROVIDES_devel="
-	libxml2_devel = $portVersion
-	cmd:xml2_config = $portVersion compat >= 2
-	devel:libxml2 = $portVersion compat >= 2
+	libxml2${secondaryArchSuffix}_devel = $portVersion
+	cmd:xml2_config$secondaryArchSuffix = $portVersion compat >= 2
+	devel:libxml2$secondaryArchSuffix = $portVersion compat >= 2
 	"
 REQUIRES_devel="
-	libxml2 == $portVersion base
+	libxml2$secondaryArchSuffix == $portVersion base
 	"