diff --git a/main/python3/APKBUILD b/main/python3/APKBUILD
index 4a3957f7ff27b9dcbf0109c718d795bc2835b3c0..9d5171fca7be2461c240ee2a888718e87914989e 100644
--- a/main/python3/APKBUILD
+++ b/main/python3/APKBUILD
@@ -6,7 +6,7 @@ pkgname=python3
pkgver=3.10.2
_bluez_ver=5.55
_basever="${pkgver%.*}"
-pkgrel=0
+pkgrel=1
pkgdesc="A high-level scripting language"
url="https://www.python.org/"
arch="all"
@@ -21,6 +21,7 @@ source="https://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.xz
musl-find_library.patch
custom-bluetooth-h-path.patch
arm-alignment.patch
+ expat-fix.patch
"
options="net" # Required for tests
builddir="$srcdir/Python-$pkgver"
@@ -203,4 +204,5 @@ fe123dd871f7a3fa868c499a957b94f1d815a1e1de964aaff1116c579defd4d9d1e9b7eb418cf114
ab8eaa2858d5109049b1f9f553198d40e0ef8d78211ad6455f7b491af525bffb16738fed60fc84e960c4889568d25753b9e4a1494834fea48291b33f07000ec2 musl-find_library.patch
1c896499d5b50234a49e9221da08f9948443734e7b3af02554c6eb153ec6d62eeada287fd3d38270e7c338cb795e9a598f316018c45df27b2a2170fad6c69b7a custom-bluetooth-h-path.patch
a84483246e413650a904c34c18f5e4f4168c39067d069f48557c330de6eb3db19fd96a4d453d742db3dcb7c7f962722903f62823c752ff90510c89830435ffc0 arm-alignment.patch
+a98b1c2b2520d996ad3181513e20bc8f1705f0ed3ec262d67d7f1a7d6dc3a90e8ef68078124c2ba008945bf07494fc978a6eaeb62309a9d1d48450fccab62671 expat-fix.patch
"
diff --git a/main/python3/expat-fix.patch b/main/python3/expat-fix.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f95b648a1d4f93c8ffcb5a4512a23b4c850efe5d
--- /dev/null
+++ b/main/python3/expat-fix.patch
@@ -0,0 +1,112 @@
+From dd7da01325ca32796e139507a38da08886f8f972 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 20 Feb 2022 20:39:07 +0100
+Subject: [PATCH 1/3] test_xml_etree.py: Drop mistaken test_issue3151
+
+Curly brackets were never allowed in namespace URIs
+according to RFC 3986, and so-called namespace-validating
+XML parsers have the right to reject them a invalid URIs.
+
+libexpat >=2.4.5 has become strcter in that regard due to
+related security issues; with ET.XML instantiating a
+namespace-aware parser under the hood, this test has no
+future in CPython.
+
+References:
+- https://datatracker.ietf.org/doc/html/rfc3968
+- https://www.w3.org/TR/xml-names/
+---
+ Lib/test/test_xml_etree.py | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/Lib/test/test_xml_etree.py b/Lib/test/test_xml_etree.py
+index a25f536134c7b..c5292b5e9ef68 100644
+--- a/Lib/test/test_xml_etree.py
++++ b/Lib/test/test_xml_etree.py
+@@ -2192,12 +2192,6 @@ def test_issue6233(self):
+ b"<?xml version='1.0' encoding='ascii'?>\n"
+ b'<body>tãg</body>')
+
+- def test_issue3151(self):
+- e = ET.XML('<prefix:localname xmlns:prefix="${stuff}"/>')
+- self.assertEqual(e.tag, '{${stuff}}localname')
+- t = ET.ElementTree(e)
+- self.assertEqual(ET.tostring(e), b'<ns0:localname xmlns:ns0="${stuff}" />')
+-
+ def test_issue6565(self):
+ elem = ET.XML("<body><tag/></body>")
+ self.assertEqual(summarize_list(elem), ['tag'])
+
+From aa7523fef6e3759d02a02fa484acfebf9d0bd852 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 20 Feb 2022 20:56:38 +0100
+Subject: [PATCH 2/3] test_minidom.py: Support Expat >=2.4.5
+
+---
+ Lib/test/test_minidom.py | 17 +++++++++++++++--
+ 1 file changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/Lib/test/test_minidom.py b/Lib/test/test_minidom.py
+index 1663b1f1143dd..97620258d82f6 100644
+--- a/Lib/test/test_minidom.py
++++ b/Lib/test/test_minidom.py
+@@ -6,10 +6,12 @@
+ from test import support
+ import unittest
+
++import pyexpat
+ import xml.dom.minidom
+
+ from xml.dom.minidom import parse, Node, Document, parseString
+ from xml.dom.minidom import getDOMImplementation
++from xml.parsers.expat import ExpatError
+
+
+ tstfile = support.findfile("test.xml", subdir="xmltestdata")
+@@ -1147,7 +1149,13 @@ def testEncodings(self):
+
+ # Verify that character decoding errors raise exceptions instead
+ # of crashing
+- self.assertRaises(UnicodeDecodeError, parseString,
++ if pyexpat.version_info >= (2, 4, 5):
++ self.assertRaises(ExpatError, parseString,
++ b'<fran\xe7ais></fran\xe7ais>')
++ self.assertRaises(ExpatError, parseString,
++ b'<franais>Comment \xe7a va ? Tr\xe8s bien ?</franais>')
++ else:
++ self.assertRaises(UnicodeDecodeError, parseString,
+ b'<fran\xe7ais>Comment \xe7a va ? Tr\xe8s bien ?</fran\xe7ais>')
+
+ doc.unlink()
+@@ -1609,7 +1617,12 @@ def testEmptyXMLNSValue(self):
+ self.confirm(doc2.namespaceURI == xml.dom.EMPTY_NAMESPACE)
+
+ def testExceptionOnSpacesInXMLNSValue(self):
+- with self.assertRaisesRegex(ValueError, 'Unsupported syntax'):
++ if pyexpat.version_info >= (2, 4, 5):
++ context = self.assertRaisesRegex(ExpatError, 'syntax error')
++ else:
++ context = self.assertRaisesRegex(ValueError, 'Unsupported syntax')
++
++ with context:
+ parseString('<element xmlns:abc="http:abc.com/de f g/hi/j k"><abc:foo /></element>')
+
+ def testDocRemoveChild(self):
+
+From 2dcb3051b243fff2f031c14eea50a649e8b7c7ea Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 20 Feb 2022 21:03:40 +0100
+Subject: [PATCH 3/3] Add blurp file for bpo-46811 to section "Library"
+
+---
+ .../NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst
+
+diff --git a/Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst b/Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst
+new file mode 100644
+index 0000000000000..6969bd1898f65
+--- /dev/null
++++ b/Misc/NEWS.d/next/Library/2022-02-20-21-03-31.bpo-46811.8BxgdQ.rst
+@@ -0,0 +1 @@
++Make test suite support Expat >=2.4.5