diff --git a/dev-python/pycairo/pycairo-1.24.0.recipe b/dev-python/pycairo/pycairo-1.24.0.recipe
index e2d788311..32cd43a46 100644
--- a/dev-python/pycairo/pycairo-1.24.0.recipe
+++ b/dev-python/pycairo/pycairo-1.24.0.recipe
@@ -4,28 +4,41 @@ and to deviate only in cases which are clearly better implemented in a more ‘P
 HOMEPAGE="https://pypi.org/project/pycairo/"
 COPYRIGHT="2023 pycairo developers"
 LICENSE="GNU LGPL v2.1"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/pygobject/pycairo/releases/download/v$portVersion/pycairo-$portVersion.tar.gz"
 CHECKSUM_SHA256="1444d52f1bb4cc79a4a0c0fe2ccec4bd78ff885ab01ebe1c0f637d8392bcafb6"
-PATCHES="$portName-$portVersion.patchset"
-ARCHITECTURES="?all x86_64 ?x86_gcc2 ?x86"
+PATCHES="pycairo-$portVersion.patchset"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
-	$portName = $portVersion
+	pycairo$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
-	haiku
+	haiku$secondaryArchSuffix
 	lib:libcairo$secondaryArchSuffix
 	lib:libcairo_gobject$secondaryArchSuffix
 	lib:libcairo_script_interpreter$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
+	haiku${secondaryArchSuffix}_devel
 	devel:libcairo$secondaryArchSuffix
 	devel:libcairo_gobject$secondaryArchSuffix
 	devel:libcairo_script_interpreter$secondaryArchSuffix
 	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:gcc$secondaryArchSuffix
+	cmd:python$pythonVersion
+	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	"
 
 PYTHON_PACKAGES=(python38 python39 python310)
 PYTHON_VERSIONS=(3.8 3.9 3.10)
@@ -36,6 +49,12 @@ for i in "${!PYTHON_PACKAGES[@]}"; do
 	eval "PROVIDES_${pythonPackage}=\"
 		${portName}_$pythonPackage = $portVersion
 		\""
+	# Also provide "non _x86" package on x86 32 bits
+	if [ "$targetArchitecture" = "x86_gcc2" ]; then
+		eval "PROVIDES_${pythonPackage}+=\"
+			pycairo_$pythonPackage = $portVersion
+			\""
+	fi
 	eval "REQUIRES_$pythonPackage=\"
 		haiku
 		setuptools_$pythonPackage
@@ -47,17 +66,6 @@ for i in "${!PYTHON_PACKAGES[@]}"; do
 		packaging_$pythonPackage
 		setuptools_$pythonPackage
 		"
-	BUILD_PREREQUIRES="$BUILD_PREREQUIRES
-		cmd:aclocal
-		cmd:autoconf
-		cmd:automake
-		cmd:gcc$secondaryArchSuffix
-		cmd:python$pythonVersion
-		cmd:ld$secondaryArchSuffix
-		cmd:libtoolize
-		cmd:make
-		cmd:pkg_config$secondaryArchSuffix
-		"
 done
 
 INSTALL()