diff --git a/app-arch/brotli/brotli-1.0.9.recipe b/app-arch/brotli/brotli-1.0.9.recipe
index 5c443e9c5..4f62b3e96 100644
--- a/app-arch/brotli/brotli-1.0.9.recipe
+++ b/app-arch/brotli/brotli-1.0.9.recipe
@@ -7,7 +7,7 @@ methods. It is similar in speed with deflate but offers more dense compression."
 HOMEPAGE="https://github.com/google/brotli"
 COPYRIGHT="2009, 2010, 2013-2018 Brotli Authors"
 LICENSE="MIT"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="https://github.com/google/brotli/archive/v$portVersion.tar.gz"
 # Testdata missing in Tarball, see https://github.com/google/brotli/issues/850
 # For tests 1/ use the git URL
@@ -17,7 +17,7 @@ CHECKSUM_SHA256="f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe4
 SOURCE_FILENAME="brotli-$portVersion.tar.gz"
 PATCHES="brotli-$portVersion.patchset"
 
-ARCHITECTURES="all"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
 # For now the library will follow $portVersion,
@@ -59,53 +59,35 @@ BUILD_PREREQUIRES="
 	cmd:make
 	"
 
-PYTHON_PACKAGES=()
-PYTHON_VERSIONS=()
-PYTHON_LIBSUFFIXES=()
-# We don't have python2 for secondaryArch,
-if [ -z "$secondaryArchSuffix" ]; then
-	PYTHON_PACKAGES+=(python)
-	PYTHON_VERSIONS+=(2.7)
-	PYTHON_LIBSUFFIXES+=("")
-	BUILD_REQUIRES+="
-		setuptools_python
-		"
-	BUILD_PREREQUIRES+="
-		cmd:python2
-		"
-fi
-# gcc2 does not support the flags passed by python3
-if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
-	PYTHON_PACKAGES+=(python3)
-	PYTHON_VERSIONS+=(3.7)
-	PYTHON_LIBSUFFIXES+=(m)
-	BUILD_REQUIRES+="
-		setuptools_python3
-		"
-	BUILD_PREREQUIRES+="
-		cmd:python3
-		"
-fi
+PYTHON_PACKAGES+=(python39)
+PYTHON_VERSIONS+=(3.9)
 for i in "${!PYTHON_PACKAGES[@]}"; do
 	pythonPackage=${PYTHON_PACKAGES[i]}
 	pythonVersion=${PYTHON_VERSIONS[$i]}
-	pythonLibSuffix=${PYTHON_LIBSUFFIXES[$i]}
 
 	eval "PROVIDES_${pythonPackage}=\"
 		${portName}_$pythonPackage = $portVersion
 		\""
 	eval "REQUIRES_$pythonPackage=\"
 		haiku$secondaryArchSuffix
-		lib:libpython$pythonVersion$pythonLibSuffix$secondaryArchSuffix
+		lib:libpython$pythonVersion$secondaryArchSuffix
 		\""
+	BUILD_REQUIRES+="
+		setuptools_$pythonPackage
+		"
+	BUILD_PREREQUIRES+="
+		cmd:python$pythonVersion
+		"
 done
 
+
 BUILD()
 {
 	runConfigure --omit-buildspec ./configure-cmake --disable-debug
 	make $jobArgs
 }
 
+
 INSTALL()
 {
 	make install
@@ -117,8 +99,10 @@ INSTALL()
 		python=python$pythonVersion
 		installLocation=$prefix/lib/$python/vendor-packages/
 		export PYTHONPATH=$installLocation:$PYTHONPATH
+
 		mkdir -p $installLocation
 		rm -rf build
+
 		$python setup.py build install \
 			--root=/ --prefix=$prefix
 
@@ -141,6 +125,7 @@ INSTALL()
 		"$developDir"
 }
 
+
 TEST()
 {
 	make test