diff --git a/dev-lang/python/python3-3.5.1.recipe b/dev-lang/python/python3-3.5.1.recipe
index 5986b973a..70e5d275e 100644
--- a/dev-lang/python/python3-3.5.1.recipe
+++ b/dev-lang/python/python3-3.5.1.recipe
@@ -14,12 +14,21 @@ COPYRIGHT="1990-2015, Python Software Foundation"
 SOURCE_URI="https://www.python.org/ftp/python/$portVersion/Python-$portVersion.tar.xz"
 CHECKSUM_SHA256="c6d57c0c366d9060ab6c0cdf889ebf3d92711d466cc0119c441dbf2746f725c9"
 REVISION="1"
-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="x86 x86_64"
+SECONDARY_ARCHITECTURES="!x86"
 
 PATCHES="python3-$portVersion.patchset"
 
+# On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
 PROVIDES="
-	python3 = $portVersion compat >= 3.5
+	python3$secondaryArchSuffix = $portVersion compat >= 3.5
 	cmd:2to3 = $portVersion compat >= 3.5
 	cmd:2to3_3.5 = $portVersion compat >= 3.5
 	cmd:idle = $portVersion compat >= 3.5
@@ -35,39 +44,39 @@ PROVIDES="
 	cmd:python3.5m_config = $portVersion compat >= 3.5
 	cmd:pyvenv = $portVersion compat >= 3.5
 	cmd:pyvenv_3.5 = $portVersion compat >= 3.5
-	devel:libpython3.5m = 1.0
-	lib:libpython3.5m = 1.0
-	lib:libpython3 = 3.5
+	devel:libpython3.5m$secondaryArchSuffix = 1.0
+	lib:libpython3.5m$secondaryArchSuffix = 1.0
+	lib:libpython3$secondaryArchSuffix = 3.5
 	"
 REQUIRES="
-	haiku
+	haiku$secondaryArchSuffix
 	cmd:file
-	lib:libbz2
-	lib:libexpat
-	lib:libncurses
-	lib:libssl
-	lib:libreadline
-	lib:libsqlite3
-	lib:libz
+	lib:libbz2$secondaryArchSuffix
+	lib:libexpat$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
+	lib:libreadline$secondaryArchSuffix
+	lib:libsqlite3$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
-	devel:libbz2
-	devel:libexpat
-	devel:libncurses
-	devel:libssl
-	devel:libreadline
-	devel:libsqlite3
-	devel:libz
+	devel:libbz2$secondaryArchSuffix
+	devel:libexpat$secondaryArchSuffix
+	devel:libncurses$secondaryArchSuffix
+	devel:libssl$secondaryArchSuffix
+	devel:libreadline$secondaryArchSuffix
+	devel:libsqlite3$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	haiku_devel
+	haiku${secondaryArchSuffix}_devel
 	cmd:aclocal
 	cmd:autoconf
 	cmd:find
-	cmd:gcc
-	cmd:ld
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
 	cmd:libtoolize
-	cmd:pkg_config
+	cmd:pkg_config$secondaryArchSuffix
 	cmd:make
 	cmd:python
 	"
@@ -89,9 +98,9 @@ BUILD()
 	libtoolize --force --copy --install
 	aclocal
 	autoconf
-	runConfigure ./configure \
+	runConfigure --omit-dirs binDir ./configure \
 		--enable-shared --without-ensurepip \
-		--with-system-expat
+		--with-system-expat --bindir=$commandBinDir
 
 	# prevent make from rebuilding stuff that requires python
 	touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h