diff --git a/media-libs/libvorbis/libvorbis-1.3.2.recipe b/media-libs/libvorbis/libvorbis-1.3.2.recipe
index b810914e1..70b9f959f 100644
--- a/media-libs/libvorbis/libvorbis-1.3.2.recipe
+++ b/media-libs/libvorbis/libvorbis-1.3.2.recipe
@@ -7,38 +7,37 @@ LICENSE="BSD (3-clause)"
 COPYRIGHT="1994-2010 Xiph.Org Foundation"
 SRC_URI="http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.2.tar.gz"
 CHECKSUM_MD5="c870b9bd5858a0ecb5275c14486d9554"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 ?x86"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="libvorbis-1.3.2.patchset"
 
 PROVIDES="
-	libvorbis = $portVersion
-	lib:libvorbis = 0.4.5 compat >= 0
-	lib:libvorbisenc = 2.0.8 compat >= 2
-	lib:libvorbisfile = 3.3.4 compat >= 3
+	libvorbis$secondaryArchSuffix = $portVersion
+	lib:libvorbis$secondaryArchSuffix = 0.4.5 compat >= 0
+	lib:libvorbisenc$secondaryArchSuffix = 2.0.8 compat >= 2
+	lib:libvorbisfile$secondaryArchSuffix = 3.3.4 compat >= 3
 	"
 REQUIRES="
-	haiku >= $haikuVersion
-	lib:libogg
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libogg$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	devel:libogg
+	devel:libogg$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
 	cmd:pkg_config
 	"
 
-SOURCE_DIR="$portVersionedName"
-
 BUILD()
 {
 	libtoolize -fci
@@ -66,13 +65,12 @@ INSTALL()
 
 # ----- devel package -------------------------------------------------------
 
-SUMMARY_devel="The libvorbis development files"
 PROVIDES_devel="
-	libvorbis_devel = $portVersion
-	devel:libvorbis = 0.4.5 compat >= 0
-	devel:libvorbisenc = 2.0.8 compat >= 2
-	devel:libvorbisfile = 3.3.4 compat >= 3
+	libvorbis${secondaryArchSuffix}_devel = $portVersion
+	devel:libvorbis$secondaryArchSuffix = 0.4.5 compat >= 0
+	devel:libvorbisenc$secondaryArchSuffix = 2.0.8 compat >= 2
+	devel:libvorbisfile$secondaryArchSuffix = 3.3.4 compat >= 3
 	"
 REQUIRES_devel="
-	libvorbis == $portVersion
+	libvorbis$secondaryArchSuffix == $portVersion
 	"