diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.10.recipe b/dev-python/sqlalchemy/sqlalchemy-1.3.22.recipe
similarity index 77%
rename from dev-python/sqlalchemy/sqlalchemy-1.3.10.recipe
rename to dev-python/sqlalchemy/sqlalchemy-1.3.22.recipe
index e418c5f8c..cc80837bc 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.10.recipe
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.22.recipe
@@ -10,24 +10,28 @@ COPYRIGHT="2006-2019 SQLAlchemy authors and contributors"
 LICENSE="MIT"
 REVISION="1"
 SOURCE_URI="https://pypi.org/packages/source/S/SQLAlchemy/SQLAlchemy-$portVersion.tar.gz"
-CHECKSUM_SHA256="0f0768b5db594517e1f5e1572c73d14cf295140756431270d89496dc13d5e46c"
+CHECKSUM_SHA256="758fc8c4d6c0336e617f9f6919f9daea3ab6bb9b07005eda9a1a682e24a6cacc"
 SOURCE_DIR="SQLAlchemy-$portVersion"
 
-ARCHITECTURES="any"
+ARCHITECTURES="!x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	$portName = $portVersion
 	"
 REQUIRES="
-	haiku
+	haiku$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	gcc$secondaryArchSuffix
 	"
 
-PYTHON_PACKAGES=(python python36 python3)
-PYTHON_VERSIONS=(2.7 3.6 3.7)
+PYTHON_PACKAGES=(python3 python38 python39)
+PYTHON_VERSIONS=(3.7 3.8 3.9)
 for i in "${!PYTHON_PACKAGES[@]}"; do
 pythonPackage=${PYTHON_PACKAGES[i]}
 pythonVersion=${PYTHON_VERSIONS[$i]}
@@ -36,7 +40,7 @@ eval "PROVIDES_${pythonPackage}=\"\
 	cmd:alembic$pythonVersion\n\
 	\"; \
 REQUIRES_$pythonPackage=\"\
-	haiku\n\
+	haiku$secondaryArchSuffix\n\
 	cmd:python$pythonVersion\
 	\""
 BUILD_REQUIRES="$BUILD_REQUIRES
@@ -45,9 +49,17 @@ BUILD_PREREQUIRES="$BUILD_PREREQUIRES
 	cmd:python$pythonVersion"
 done
 
-REPLACES_python="
-	python_sqlalchemy
-	"
+if [ "$targetArchitecture" = "x86_gcc2" ]; then
+	PROVIDES_python3+="
+		sqlalchemy_python3 = $portVersion
+		"
+	PROVIDES_python38+="
+		sqlalchemy_python38 = $portVersion
+		"
+	PROVIDES_python39+="
+		sqlalchemy_python39 = $portVersion
+		"
+fi
 
 BUILD()
 {