diff --git a/dev-python/markupsafe/markupsafe-1.1.1.recipe b/dev-python/markupsafe/markupsafe-1.1.1.recipe
deleted file mode 100644
index 1572b6f2e..000000000
--- a/dev-python/markupsafe/markupsafe-1.1.1.recipe
+++ /dev/null
@@ -1,65 +0,0 @@
-SUMMARY="XML/HTML/XHTML Markup safe string for Python"
-DESCRIPTION="This package implements a XML/HTML/XHTML Markup safe string \
-for Python."
-HOMEPAGE="https://pypi.org/project/MarkupSafe/"
-COPYRIGHT="2019 Armin Ronacher and contributors"
-LICENSE="BSD (3-clause)"
-REVISION="5"
-SOURCE_URI="https://github.com/pallets/markupsafe/archive/1.1.1.tar.gz"
-CHECKSUM_SHA256="222a10e3237d92a9cd45ed5ea882626bc72bc5e0264d3ed0f2c9129fa69fc167"
-SOURCE_FILENAME="markupsafe-$portVersion.tag.gz"
-SOURCE_DIR="markupsafe-$portVersion"
-
-ARCHITECTURES="any"
-
-PROVIDES="
-	$portName = $portVersion
-	"
-REQUIRES="
-	haiku
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	"
-BUILD_PREREQUIRES="
-	cmd:gcc
-	"
-PYTHON_PACKAGES=(python39 python310)
-PYTHON_VERSIONS=(3.9 3.10)
-for i in "${!PYTHON_PACKAGES[@]}"; do
-pythonPackage=${PYTHON_PACKAGES[i]}
-pythonVersion=${PYTHON_VERSIONS[$i]}
-eval "PROVIDES_${pythonPackage}=\"\
-	${portName}_$pythonPackage = $portVersion\
-	\"; \
-REQUIRES_$pythonPackage=\"\
-	haiku\n\
-	cmd:python$pythonVersion\
-	\""
-BUILD_REQUIRES="$BUILD_REQUIRES
-	setuptools_$pythonPackage"
-BUILD_PREREQUIRES="$BUILD_PREREQUIRES
-	cmd:python$pythonVersion"
-done
-
-INSTALL()
-{
-	for i in "${!PYTHON_PACKAGES[@]}"; do
-		pythonPackage=${PYTHON_PACKAGES[i]}
-		pythonVersion=${PYTHON_VERSIONS[$i]}
-
-		# GENERIC: all python_setuptools-based installs need this
-		python=python$pythonVersion
-		pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3)
-		installLocation=$prefix/lib/python$pythonVersion/vendor-packages/
-		export PYTHONPATH=$installLocation:$PYTHONPATH
-		mkdir -p $installLocation
-		rm -rf build
-		$python setup.py install \
-			--root=/ --prefix=$prefix
-
-		packageEntries  $pythonPackage \
-			$prefix/lib/python*
-	done
-}
diff --git a/dev-python/markupsafe/markupsafe-2.1.3.recipe b/dev-python/markupsafe/markupsafe-2.1.3.recipe
new file mode 100644
index 000000000..5c07afccc
--- /dev/null
+++ b/dev-python/markupsafe/markupsafe-2.1.3.recipe
@@ -0,0 +1,77 @@
+SUMMARY="Safely add untrusted strings to HTML/XML markup"
+DESCRIPTION="MarkupSafe implements a text object that escapes characters so it is safe to use in \
+HTML and XML. Characters that have special meanings are replaced so that they display as the \
+actual characters. This mitigates injection attacks, meaning untrusted user input can safely be \
+displayed on a page. Escaping is implemented in C so it is as efficient as possible."
+HOMEPAGE="https://palletsprojects.com/p/markupsafe/"
+COPYRIGHT="2019 Armin Ronacher and contributors"
+LICENSE="BSD (3-clause)"
+REVISION="1"
+SOURCE_URI="https://pypi.python.org/packages/source/m/markupsafe/MarkupSafe-$portVersion.tar.gz"
+CHECKSUM_SHA256="af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad"
+SOURCE_DIR="MarkupSafe-$portVersion"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+PROVIDES="
+	$portName = $portVersion
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	"
+BUILD_PREREQUIRES="
+	cmd:gcc$secondaryArchSuffix
+	"
+
+PYTHON_PACKAGES=(python39 python310)
+PYTHON_VERSIONS=(3.9 3.10)
+for i in "${!PYTHON_PACKAGES[@]}"; do
+	pythonPackage=${PYTHON_PACKAGES[i]}
+	pythonVersion=${PYTHON_VERSIONS[$i]}
+
+	eval "PROVIDES_${pythonPackage}=\"
+		${portName}_$pythonPackage = $portVersion
+		\""
+
+	if [ "$targetArchitecture" = x86_gcc2 ]; then
+		eval "PROVIDES_$pythonPackage+=\"
+			markupsafe_$pythonPackage = $portVersion
+			\""
+	fi
+
+	eval "REQUIRES_$pythonPackage=\"
+		$REQUIRES
+		cmd:python$pythonVersion
+		\""
+	BUILD_REQUIRES+="
+		build_$pythonPackage
+		installer_$pythonPackage
+		setuptools_$pythonPackage
+		wheel_$pythonPackage
+		"
+	BUILD_PREREQUIRES+="
+		cmd:python$pythonVersion
+		"
+done
+
+INSTALL()
+{
+	for i in "${!PYTHON_PACKAGES[@]}"; do
+		pythonVersion=${PYTHON_VERSIONS[$i]}
+
+		python=python$pythonVersion
+
+		rm -rf dist
+
+		$python -m build --wheel --skip-dependency-check --no-isolation
+		$python -m installer --p $prefix dist/*.whl
+
+		packageEntries ${PYTHON_PACKAGES[i]} \
+			"$prefix"/lib/python*
+	done
+}