diff --git a/dev-python/pyzmq/pyzmq-16.0.2.recipe b/dev-python/pyzmq/pyzmq-16.0.2.recipe
index 26277d361..ab5e5c364 100644
--- a/dev-python/pyzmq/pyzmq-16.0.2.recipe
+++ b/dev-python/pyzmq/pyzmq-16.0.2.recipe
@@ -5,38 +5,48 @@ This package contains Python bindings for ØMQ. \
 HOMEPAGE="http://www.zeromq.org/bindings:python"
 COPYRIGHT="2009-2012, Brian Granger, Min Ragan-Kelley"
 LICENSE="GNU LGPL v3"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://files.pythonhosted.org/packages/source/p/pyzmq/pyzmq-$portVersion.tar.gz"
 CHECKSUM_SHA256="0322543fff5ab6f87d11a8a099c4c07dd8a1719040084b6ce9162bcdf5c45c9d"
 
-ARCHITECTURES="?x86_gcc2 ?x86 x86_64"
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	$portName = $portVersion
+	pyzmq$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
+	haiku${secondaryArchSuffix}_devel
 	devel:libzmq$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc
-	cmd:pkg_config
+	cmd:gcc$secondaryArchSuffix
+	cmd:pkg_config$secondaryArchSuffix
 	"
-PYTHON_PACKAGES=(python python3)
-PYTHON_VERSIONS=(2.7 3.6)
+PYTHON_PACKAGES=(python3)
+PYTHON_VERSIONS=(3.6)
+if [ -z "$secondaryArchSuffix" ]; then
+	PYTHON_PACKAGES+=(python)
+	PYTHON_VERSIONS+=(2.7)
+fi
 for i in "${!PYTHON_PACKAGES[@]}"; do
 pythonPackage=${PYTHON_PACKAGES[i]}
 pythonVersion=${PYTHON_VERSIONS[$i]}
+maybe_pyzmqNoSuffix=
+if [ "$targetArchitecture" = "x86_gcc2" ]; then
+	maybe_pyzmqNoSuffix="pyzmq_$pythonPackage = $portVersion"
+fi
 eval "PROVIDES_${pythonPackage}=\"\
-	${portName}_$pythonPackage = $portVersion\
+	pyzmq${secondaryArchSuffix}_$pythonPackage = $portVersion\n\
+	$maybe_pyzmqNoSuffix\
 	\"; \
 REQUIRES_$pythonPackage=\"\
-	haiku\n\
-	lib:libzmq\n\
+	haiku$secondaryArchSuffix\n\
+	lib:libzmq$secondaryArchSuffix\n\
 	cmd:python$pythonVersion\
 	\""
 BUILD_REQUIRES="$BUILD_REQUIRES