diff --git a/media-libs/libvpx/libvpx-1.0.0.recipe b/media-libs/libvpx/libvpx-1.0.0.recipe
index 084c757ab..874e17cd9 100644
--- a/media-libs/libvpx/libvpx-1.0.0.recipe
+++ b/media-libs/libvpx/libvpx-1.0.0.recipe
@@ -11,29 +11,35 @@ COPYRIGHT="2009-2012 Google Inc.,
            The Xiph.Org Foundation"
 SRC_URI="http://webm.googlecode.com/files/libvpx-v1.0.0.tar.bz2"
 CHECKSUM_MD5="d987b5140412edd37d2c6b10c29ad484"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 ?x86"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="libvpx-1.0.0.patchset"
 
 PROVIDES="
-	libvpx = $portVersion
-	cmd:vp8_scalable_patterns = $portVersion
-	cmd:vpxdec = $portVersion compat >= 1
-	cmd:vpxenc = $portVersion compat >= 1
-	lib:libvpx = $portVersion compat >= 1
+	libvpx$secondaryArchSuffix = $portVersion
+	lib:libvpx$secondaryArchSuffix = $portVersion compat >= 1
 	"
+if [ -z "$secondaryArchSuffix" ]; then
+	PROVIDES="$PROVIDES
+		cmd:vp8_scalable_patterns = $portVersion
+		cmd:vpxdec = $portVersion compat >= 1
+		cmd:vpxenc = $portVersion compat >= 1
+		"
+fi
+
 REQUIRES="
-	haiku >= $haikuVersion
+	haiku$secondaryArchSuffix >= $haikuVersion
 	"
 BUILD_REQUIRES="
 	"
 	# Note: The build system also looks for libvorbis and SDL, but that seems
 	# to be needed only for building the sample player, which we don't need.
 BUILD_PREREQUIRES="
-	haiku_devel >= $haikuVersion
-	cmd:gcc
-	cmd:ld
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:perl
 	cmd:yasm
@@ -46,6 +52,7 @@ BUILD()
 	# not an auto tools configure
 	./configure \
 		--prefix="$prefix" \
+		--libdir="$libDir" \
 		--as=yasm \
 		--enable-pic \
 		--enable-shared \
@@ -60,20 +67,26 @@ INSTALL()
 	prepareInstalledDevelLibs libvpx
 	fixPkgconfig
 
-	mv $prefix/include $includeDir
+	mkdir -p $includeDir
+	mv $prefix/include/* $includeDir
+	rmdir $prefix/include
 
 	# devel package
 	packageEntries devel \
 		$developDir
+
+	# Remove stuff we don't need in the secondary architecture base package.
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $prefix/bin
+	fi
 }
 
 # ----- devel package -------------------------------------------------------
 
-SUMMARY_devel="The libvpx development files"
 PROVIDES_devel="
-	libvpx_devel = $portVersion
-	devel:libvpx = $portVersion compat >= 1
+	libvpx${secondaryArchSuffix}_devel = $portVersion
+	devel:libvpx$secondaryArchSuffix = $portVersion compat >= 1
 	"
 REQUIRES_devel="
-	libvpx == $portVersion
+	libvpx$secondaryArchSuffix == $portVersion
 	"