diff --git a/media-libs/libtheora/libtheora-1.1.1.recipe b/media-libs/libtheora/libtheora-1.1.1.recipe
index 621e03e32..8886f03f0 100644
--- a/media-libs/libtheora/libtheora-1.1.1.recipe
+++ b/media-libs/libtheora/libtheora-1.1.1.recipe
@@ -9,39 +9,38 @@ LICENSE="BSD (3-clause)"
 COPYRIGHT="2002-2009 Xiph.Org Foundation"
 SRC_URI="http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2"
 CHECKSUM_MD5="292ab65cedd5021d6b7ddd117e07cd8e"
-REVISION="1"
-ARCHITECTURES="x86_gcc2 ?x86"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PATCHES="libtheora-1.1.1.patchset"
 
 PROVIDES="
-	libtheora = $portVersion
-	lib:libtheora = 0.3.10 compat >= 0
-	lib:libtheoradec = 1.1.4 compat >= 1
-	lib:libtheoraenc = 1.1.2 compat >= 1
+	libtheora$secondaryArchSuffix = $portVersion
+	lib:libtheora$secondaryArchSuffix = 0.3.10 compat >= 0
+	lib:libtheoradec$secondaryArchSuffix = 1.1.4 compat >= 1
+	lib:libtheoraenc$secondaryArchSuffix = 1.1.2 compat >= 1
 	"
 REQUIRES="
-	haiku >= $haikuVersion
-	lib:libogg
+	haiku$secondaryArchSuffix >= $haikuVersion
+	lib:libogg$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	devel:libogg
+	devel:libogg$secondaryArchSuffix
 	"
 	# 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
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
 	cmd:aclocal
 	cmd:autoconf
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
 	cmd:make
 	cmd:pkg_config
 	"
 
-SOURCE_DIR="$portVersionedName"
-
 BUILD()
 {
 	libtoolize --force --copy --install
@@ -68,13 +67,12 @@ INSTALL()
 
 # ----- devel package -------------------------------------------------------
 
-SUMMARY_devel="The libtheora development files"
 PROVIDES_devel="
-	libtheora_devel = $portVersion
-	devel:libtheora = 0.3.10 compat >= 0
-	devel:libtheoradec = 1.1.4 compat >= 1
-	devel:libtheoraenc = 1.1.2 compat >= 1
+	libtheora${secondaryArchSuffix}_devel = $portVersion
+	devel:libtheora$secondaryArchSuffix = 0.3.10 compat >= 0
+	devel:libtheoradec$secondaryArchSuffix = 1.1.4 compat >= 1
+	devel:libtheoraenc$secondaryArchSuffix = 1.1.2 compat >= 1
 	"
 REQUIRES_devel="
-	libtheora == $portVersion
+	libtheora$secondaryArchSuffix == $portVersion
 	"