diff --git a/dev-python/apsw/apsw-3.36.0~r1.recipe b/dev-python/apsw/apsw-3.36.0~r1.recipe
index 6d2a39cda..f5aeb812e 100644
--- a/dev-python/apsw/apsw-3.36.0~r1.recipe
+++ b/dev-python/apsw/apsw-3.36.0~r1.recipe
@@ -12,7 +12,8 @@ SOURCE_URI="https://github.com/rogerbinns/apsw/archive/3.36.0-r1.tar.gz"
 CHECKSUM_SHA256="133ee2291851e0144661eba25517c7feb026c6d5896df90ef7ea0feddf03a842"
 SOURCE_DIR="apsw-3.36.0-r1"
 
-ARCHITECTURES="all"
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	$portName = $portVersion
@@ -23,12 +24,12 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
-	sqlite_devel >= 3.36
+	haiku${secondaryArchSuffix}_devel
+	sqlite${secondaryArchSuffix}_devel >= 3.36
 	"
 
-PYTHON_PACKAGES=(python38 python39)
-PYTHON_VERSIONS=(3.8 3.9)
+PYTHON_PACKAGES=(python38 python39 python310)
+PYTHON_VERSIONS=(3.8 3.9 3.10)
 for i in "${!PYTHON_PACKAGES[@]}"; do
 pythonPackage=${PYTHON_PACKAGES[i]}
 pythonVersion=${PYTHON_VERSIONS[$i]}
@@ -36,9 +37,14 @@ eval "PROVIDES_${pythonPackage}=\"\
 	${portName}_$pythonPackage = $portVersion\
 	\"; \
 REQUIRES_$pythonPackage=\"\
-	haiku\n\
+	haiku$secondaryArchSuffix\n\
 	cmd:python$pythonVersion\
 	\""
+if [ "$targetArchitecture" = "x86_gcc2" ]; then
+	eval "PROVIDES_${pythonPackage}+=\"\n\
+		apsw_$pythonPackage = $portVersion\
+		\""
+fi
 BUILD_REQUIRES="$BUILD_REQUIRES
 	setuptools_$pythonPackage
 	devel:libsqlite3$secondaryArchSuffix"