diff --git a/www-client/w3m/w3m-0.5.3.recipe b/www-client/w3m/w3m-0.5.3.recipe
index 3c0fbcba8..fa1032b93 100644
--- a/www-client/w3m/w3m-0.5.3.recipe
+++ b/www-client/w3m/w3m-0.5.3.recipe
@@ -13,43 +13,51 @@ SOURCE_URI="http://downloads.sf.net/w3m/w3m-$portVersion.tar.gz"
 CHECKSUM_SHA256="e994d263f2fd2c22febfbe45103526e00145a7674a0fda79c822b97c2770a9e3"
 PATCHES="w3m-$portVersion.patch"
 
-ARCHITECTURES="x86_gcc2 x86 x86_64 ?arm ?ppc"
+ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc"
+SECONDARY_ARCHITECTURES="x86"
+
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
 
 PROVIDES="
-	w3m = $portVersion
+	w3m$secondaryArchSuffix = $portVersion
 	cmd:w3m = $portVersion
 	cmd:w3mman = $portVersion
 	"
 REQUIRES="
-	haiku
-	lib:libgc
-	lib:libssl
-	lib:libcrypto
-	lib:libncurses
-	lib:libintl
+	haiku$secondaryArchSuffix
+	lib:libgc$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
+	lib:libcrypto$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
 	cmd:nano
 	"
 
 BUILD_REQUIRES="
-	devel:libgc
-	devel:libncurses
-	devel:libssl
-	devel:libintl
+	devel:libgc$secondaryArchSuffix
+	devel:libncurses$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix
+	devel:libintl$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku_devel
-	cmd:libtoolize
+	haiku${secondaryArchSuffix}_devel
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:autoconf
 	cmd:make
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	"
 
 BUILD()
 {
 	libtoolize -fci
 	autoconf
-	runConfigure ./configure \
+	runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir" \
 	--with-editor=${portPackageLinksDir}/cmd~nano/bin/nano \
 	--with-browser=open
 	make