diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile
index 329647331c00..891b682531c3 100644
--- a/devel/py-setuptools/Makefile
+++ b/devel/py-setuptools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.198 2022/01/07 12:18:44 adam Exp $
+# $NetBSD: Makefile,v 1.199 2022/01/10 23:49:02 wiz Exp $
 
 DISTNAME=	setuptools-60.3.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -25,5 +25,7 @@ PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 PYSETUPTESTTARGET=	pytest
 
-.include "../../lang/python/distutils.mk"
+BOOTSTRAP_SETUPTOOLS=	yes
+
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-setuptools/PLIST b/devel/py-setuptools/PLIST
index fc47f279f7eb..08cba3539f88 100644
--- a/devel/py-setuptools/PLIST
+++ b/devel/py-setuptools/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.60 2022/01/07 12:18:44 adam Exp $
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/entry_points.txt
-${PYSITELIB}/${EGG_FILE}/requires.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
+@comment $NetBSD: PLIST,v 1.61 2022/01/10 23:49:02 wiz Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/_distutils_hack/__init__.py
 ${PYSITELIB}/_distutils_hack/__init__.pyc
 ${PYSITELIB}/_distutils_hack/__init__.pyo
diff --git a/devel/py-setuptools44/Makefile b/devel/py-setuptools44/Makefile
index 4ca6baab594b..a17bc765310b 100644
--- a/devel/py-setuptools44/Makefile
+++ b/devel/py-setuptools44/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/09/01 04:05:27 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2022/01/10 23:49:02 wiz Exp $
 
 DISTNAME=	setuptools-44.1.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -25,6 +25,8 @@ PYTHON_VERSIONS_ACCEPTED=	27
 
 PYSETUPTESTTARGET=	pytest
 
+BOOTSTRAP_SETUPTOOLS=	yes
+
 .include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-setuptools44/PLIST b/devel/py-setuptools44/PLIST
index 84df3075486d..80bddee2ebd5 100644
--- a/devel/py-setuptools44/PLIST
+++ b/devel/py-setuptools44/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2020/08/31 23:04:03 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/01/10 23:49:02 wiz Exp $
 bin/easy_install-${PYVERSSUFFIX}
-${PYSITELIB}/${EGG_FILE}/PKG-INFO
-${PYSITELIB}/${EGG_FILE}/SOURCES.txt
-${PYSITELIB}/${EGG_FILE}/dependency_links.txt
-${PYSITELIB}/${EGG_FILE}/entry_points.txt
-${PYSITELIB}/${EGG_FILE}/requires.txt
-${PYSITELIB}/${EGG_FILE}/top_level.txt
-${PYSITELIB}/${EGG_FILE}/zip-safe
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/zip-safe
 ${PYSITELIB}/easy_install.py
 ${PYSITELIB}/easy_install.pyc
 ${PYSITELIB}/easy_install.pyo