diff --git a/lang/python310/Makefile b/lang/python310/Makefile
index c81972076326..3dbf8d5d004e 100644
--- a/lang/python310/Makefile
+++ b/lang/python310/Makefile
@@ -70,7 +70,6 @@ FNV_CONFIGURE_ON=	--with-hash-algorithm=fnv
 SIPHASH_CONFIGURE_ON=	--with-hash-algorithm=siphash24
 
 DEBUG_CONFIGURE_WITH=	pydebug
-DEBUG_BROKEN=		incorrect pkg-plist
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 LIBMPDEC_CONFIGURE_ON=	--with-system-libmpdec
diff --git a/lang/python310/pkg-plist b/lang/python310/pkg-plist
index 720d6427b3d3..6eea9fd42e41 100644
--- a/lang/python310/pkg-plist
+++ b/lang/python310/pkg-plist
@@ -2852,78 +2852,78 @@ lib/python%%XYDOT%%/json/encoder.py
 lib/python%%XYDOT%%/json/scanner.py
 lib/python%%XYDOT%%/json/tool.py
 lib/python%%XYDOT%%/keyword.py
-lib/python%%XYDOT%%/lib-dynload/_asyncio.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_bisect.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_blake2.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_bz2.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_codecs_cn.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_codecs_hk.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_codecs_iso2022.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_codecs_jp.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_codecs_kr.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_codecs_tw.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_contextvars.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_crypt.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_csv.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_ctypes.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_ctypes_test.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_curses.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_curses_panel.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_datetime.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_dbm.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_decimal.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_elementtree.cpython-%%XY%%.so
-%%SUPPORTED_OPENSSL%%lib/python%%XYDOT%%/lib-dynload/_hashlib.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_heapq.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_json.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_lsprof.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_lzma.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_md5.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_multibytecodec.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_multiprocessing.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_opcode.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_pickle.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_posixshmem.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_posixsubprocess.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_queue.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_random.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_sha1.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_sha256.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_sha3.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_sha512.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_socket.cpython-%%XY%%.so
-%%SUPPORTED_OPENSSL%%lib/python%%XYDOT%%/lib-dynload/_ssl.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_statistics.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_struct.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_testbuffer.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_testcapi.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_testimportmultiple.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_testinternalcapi.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_testmultiphase.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_uuid.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_xxsubinterpreters.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_xxtestfuzz.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_zoneinfo.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/array.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/audioop.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/binascii.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/cmath.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/fcntl.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/grp.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/math.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/mmap.cpython-%%XY%%.so
-%%NO_NIS%%lib/python%%XYDOT%%/lib-dynload/nis.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/ossaudiodev.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/pyexpat.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/readline.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/resource.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/select.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/syslog.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/termios.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/unicodedata.cpython-%%XY%%.so
-%%NO_DEBUG%%lib/python%%XYDOT%%/lib-dynload/xxlimited.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/xxlimited_35.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/zlib.cpython-%%XY%%.so
+lib/python%%XYDOT%%/lib-dynload/_asyncio.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_bisect.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_blake2.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_bz2.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_codecs_cn.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_codecs_hk.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_codecs_iso2022.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_codecs_jp.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_codecs_kr.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_codecs_tw.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_contextvars.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_crypt.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_csv.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_ctypes.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_ctypes_test.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_curses.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_curses_panel.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_datetime.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_dbm.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_decimal.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_elementtree.cpython-%%XY%%%%ABI%%.so
+%%SUPPORTED_OPENSSL%%lib/python%%XYDOT%%/lib-dynload/_hashlib.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_heapq.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_json.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_lsprof.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_lzma.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_md5.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_multibytecodec.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_multiprocessing.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_opcode.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_pickle.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_posixshmem.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_posixsubprocess.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_queue.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_random.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_sha1.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_sha256.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_sha3.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_sha512.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_socket.cpython-%%XY%%%%ABI%%.so
+%%SUPPORTED_OPENSSL%%lib/python%%XYDOT%%/lib-dynload/_ssl.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_statistics.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_struct.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_testbuffer.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_testcapi.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_testimportmultiple.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_testinternalcapi.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_testmultiphase.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_uuid.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_xxsubinterpreters.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_xxtestfuzz.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_zoneinfo.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/array.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/audioop.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/binascii.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/cmath.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/fcntl.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/grp.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/math.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/mmap.cpython-%%XY%%%%ABI%%.so
+%%NO_NIS%%lib/python%%XYDOT%%/lib-dynload/nis.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/ossaudiodev.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/pyexpat.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/readline.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/resource.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/select.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/syslog.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/termios.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/unicodedata.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/xxlimited.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/xxlimited_35.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/zlib.cpython-%%XY%%%%ABI%%.so
 lib/python%%XYDOT%%/lib2to3/Grammar.txt
 lib/python%%XYDOT%%/lib2to3/Grammar%%XYZDOT%%.candidate.1.pickle
 lib/python%%XYDOT%%/lib2to3/PatternGrammar.txt
diff --git a/lang/python38/Makefile b/lang/python38/Makefile
index 6a141206e512..68359a8579a8 100644
--- a/lang/python38/Makefile
+++ b/lang/python38/Makefile
@@ -69,7 +69,6 @@ FNV_CONFIGURE_ON=	--with-hash-algorithm=fnv
 SIPHASH_CONFIGURE_ON=	--with-hash-algorithm=siphash24
 
 DEBUG_CONFIGURE_WITH=	pydebug
-DEBUG_BROKEN=		incorrect pkg-plist
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 LIBMPDEC_CONFIGURE_ON=	--with-system-libmpdec
diff --git a/lang/python38/pkg-plist b/lang/python38/pkg-plist
index e6f24ecffbb3..6b57ecef4860 100644
--- a/lang/python38/pkg-plist
+++ b/lang/python38/pkg-plist
@@ -2796,77 +2796,77 @@ lib/python%%XYDOT%%/json/encoder.py
 lib/python%%XYDOT%%/json/scanner.py
 lib/python%%XYDOT%%/json/tool.py
 lib/python%%XYDOT%%/keyword.py
-lib/python%%XYDOT%%/lib-dynload/_asyncio.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_bisect.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_blake2.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_bz2.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_codecs_cn.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_codecs_hk.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_codecs_iso2022.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_codecs_jp.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_codecs_kr.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_codecs_tw.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_contextvars.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_crypt.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_csv.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_ctypes.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_ctypes_test.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_curses.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_curses_panel.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_datetime.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_dbm.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_decimal.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_elementtree.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_hashlib.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_heapq.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_json.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_lsprof.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_lzma.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_md5.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_multibytecodec.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_multiprocessing.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_opcode.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_pickle.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_posixshmem.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_posixsubprocess.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_queue.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_random.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_sha1.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_sha256.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_sha3.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_sha512.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_socket.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_ssl.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_statistics.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_struct.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_testbuffer.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_testcapi.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_testimportmultiple.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_testinternalcapi.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_testmultiphase.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_uuid.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_xxsubinterpreters.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_xxtestfuzz.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/array.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/audioop.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/binascii.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/cmath.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/fcntl.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/grp.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/math.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/mmap.cpython-%%XY%%.so
-%%NO_NIS%%lib/python%%XYDOT%%/lib-dynload/nis.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/ossaudiodev.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/parser.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/pyexpat.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/readline.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/resource.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/select.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/syslog.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/termios.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/unicodedata.cpython-%%XY%%.so
+lib/python%%XYDOT%%/lib-dynload/_asyncio.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_bisect.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_blake2.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_bz2.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_codecs_cn.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_codecs_hk.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_codecs_iso2022.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_codecs_jp.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_codecs_kr.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_codecs_tw.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_contextvars.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_crypt.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_csv.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_ctypes.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_ctypes_test.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_curses.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_curses_panel.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_datetime.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_dbm.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_decimal.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_elementtree.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_hashlib.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_heapq.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_json.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_lsprof.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_lzma.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_md5.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_multibytecodec.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_multiprocessing.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_opcode.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_pickle.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_posixshmem.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_posixsubprocess.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_queue.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_random.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_sha1.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_sha256.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_sha3.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_sha512.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_socket.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_ssl.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_statistics.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_struct.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_testbuffer.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_testcapi.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_testimportmultiple.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_testinternalcapi.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_testmultiphase.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_uuid.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_xxsubinterpreters.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_xxtestfuzz.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/array.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/audioop.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/binascii.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/cmath.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/fcntl.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/grp.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/math.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/mmap.cpython-%%XY%%%%ABI%%.so
+%%NO_NIS%%lib/python%%XYDOT%%/lib-dynload/nis.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/ossaudiodev.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/parser.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/pyexpat.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/readline.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/resource.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/select.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/syslog.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/termios.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/unicodedata.cpython-%%XY%%%%ABI%%.so
 %%NO_DEBUG%%lib/python%%XYDOT%%/lib-dynload/xxlimited.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/zlib.cpython-%%XY%%.so
+lib/python%%XYDOT%%/lib-dynload/zlib.cpython-%%XY%%%%ABI%%.so
 lib/python%%XYDOT%%/lib2to3/Grammar.txt
 lib/python%%XYDOT%%/lib2to3/Grammar%%XYZDOT%%.final.0.pickle
 lib/python%%XYDOT%%/lib2to3/PatternGrammar.txt
diff --git a/lang/python39/Makefile b/lang/python39/Makefile
index f52a1363bee6..4a0d31ba17f2 100644
--- a/lang/python39/Makefile
+++ b/lang/python39/Makefile
@@ -70,7 +70,6 @@ FNV_CONFIGURE_ON=	--with-hash-algorithm=fnv
 SIPHASH_CONFIGURE_ON=	--with-hash-algorithm=siphash24
 
 DEBUG_CONFIGURE_WITH=	pydebug
-DEBUG_BROKEN=		incorrect pkg-plist
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 LIBMPDEC_CONFIGURE_ON=	--with-system-libmpdec
diff --git a/lang/python39/pkg-plist b/lang/python39/pkg-plist
index 304ecf9b87bf..6dc70c02db99 100644
--- a/lang/python39/pkg-plist
+++ b/lang/python39/pkg-plist
@@ -2821,78 +2821,78 @@ lib/python%%XYDOT%%/json/encoder.py
 lib/python%%XYDOT%%/json/scanner.py
 lib/python%%XYDOT%%/json/tool.py
 lib/python%%XYDOT%%/keyword.py
-lib/python%%XYDOT%%/lib-dynload/_asyncio.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_bisect.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_blake2.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_bz2.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_codecs_cn.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_codecs_hk.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_codecs_iso2022.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_codecs_jp.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_codecs_kr.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_codecs_tw.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_contextvars.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_crypt.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_csv.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_ctypes.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_ctypes_test.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_curses.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_curses_panel.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_datetime.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_dbm.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_decimal.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_elementtree.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_hashlib.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_heapq.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_json.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_lsprof.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_lzma.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_md5.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_multibytecodec.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_multiprocessing.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_opcode.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_pickle.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_posixshmem.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_posixsubprocess.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_queue.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_random.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_sha1.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_sha256.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_sha3.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_sha512.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_socket.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_ssl.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_statistics.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_struct.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_testbuffer.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_testcapi.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_testimportmultiple.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_testinternalcapi.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_testmultiphase.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_uuid.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_xxsubinterpreters.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_xxtestfuzz.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/_zoneinfo.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/array.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/audioop.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/binascii.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/cmath.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/fcntl.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/grp.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/math.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/mmap.cpython-%%XY%%.so
-%%NO_NIS%%lib/python%%XYDOT%%/lib-dynload/nis.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/ossaudiodev.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/parser.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/pyexpat.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/readline.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/resource.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/select.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/syslog.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/termios.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/unicodedata.cpython-%%XY%%.so
+lib/python%%XYDOT%%/lib-dynload/_asyncio.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_bisect.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_blake2.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_bz2.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_codecs_cn.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_codecs_hk.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_codecs_iso2022.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_codecs_jp.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_codecs_kr.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_codecs_tw.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_contextvars.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_crypt.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_csv.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_ctypes.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_ctypes_test.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_curses.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_curses_panel.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_datetime.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_dbm.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_decimal.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_elementtree.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_hashlib.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_heapq.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_json.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_lsprof.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_lzma.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_md5.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_multibytecodec.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_multiprocessing.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_opcode.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_pickle.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_posixshmem.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_posixsubprocess.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_queue.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_random.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_sha1.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_sha256.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_sha3.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_sha512.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_socket.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_ssl.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_statistics.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_struct.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_testbuffer.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_testcapi.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_testimportmultiple.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_testinternalcapi.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_testmultiphase.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_uuid.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_xxsubinterpreters.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_xxtestfuzz.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/_zoneinfo.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/array.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/audioop.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/binascii.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/cmath.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/fcntl.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/grp.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/math.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/mmap.cpython-%%XY%%%%ABI%%.so
+%%NO_NIS%%lib/python%%XYDOT%%/lib-dynload/nis.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/ossaudiodev.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/parser.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/pyexpat.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/readline.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/resource.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/select.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/syslog.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/termios.cpython-%%XY%%%%ABI%%.so
+lib/python%%XYDOT%%/lib-dynload/unicodedata.cpython-%%XY%%%%ABI%%.so
 %%NO_DEBUG%%lib/python%%XYDOT%%/lib-dynload/xxlimited.cpython-%%XY%%.so
-lib/python%%XYDOT%%/lib-dynload/zlib.cpython-%%XY%%.so
+lib/python%%XYDOT%%/lib-dynload/zlib.cpython-%%XY%%%%ABI%%.so
 lib/python%%XYDOT%%/lib2to3/Grammar.txt
 lib/python%%XYDOT%%/lib2to3/Grammar%%XYZDOT%%.final.0.pickle
 lib/python%%XYDOT%%/lib2to3/PatternGrammar.txt