diff --git a/devel/py-setuptools58/Makefile b/devel/py-setuptools58/Makefile
index 6630578290d0..d77bf56bbec7 100644
--- a/devel/py-setuptools58/Makefile
+++ b/devel/py-setuptools58/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	setuptools
 PORTVERSION=	58.5.3
 CATEGORIES=	devel python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	58
 DIST_SUBDIR=	python
 
 # note: before committing to this port, contact portmgr to arrange for an
 # experimental ports run.  Untested commits may be backed out at portmgr's
 # discretion.
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Python packages installer
 WWW=		https://pypi.org/project/setuptools/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe python:3.7+
 USE_PYTHON=	allflavors autoplist concurrent distutils
 
 CPE_VENDOR=	python
 
 MAKE_ENV+=	SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
 NO_ARCH=	yes
 PYDISTUTILS_SETUP=	${PYSETUP}
 
 PLIST_FILES=	"@sample %%PYTHON_SITELIBDIR%%/easy-install.pth.dist %%PYTHON_SITELIBDIR%%/easy-install.pth"
 
 .include <bsd.port.pre.mk>
 
 .if ${FLAVOR} != ${FLAVORS:[1]}
 SUB_FILES+=	pkg-message
 SUB_LIST+=	PYTHON_VER=${PYTHON_VER}
 .endif
 
 # These create dependency loops in redports/poudriere, because setuptools
 # is currently an explicit BUILD & RUN dependency in Uses/python.mk.
 #TEST_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR}
 # pkg install -y py38-pytest py38-mock py38-pytest-fixture-config py38-pytest-virtualenv py38-paver
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/easy-install.pth.dist ${STAGEDIR}${PYTHON_SITELIBDIR}/
 
 do-test:
 	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-spyder-unittest/Makefile b/devel/py-spyder-unittest/Makefile
index 674a3965b336..23b813181a3a 100644
--- a/devel/py-spyder-unittest/Makefile
+++ b/devel/py-spyder-unittest/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	spyder-unittest
 DISTVERSION=	0.5.1
 CATEGORIES=	devel python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME:S/-/_/}-${DISTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Plugin to run tests from within the Spyder IDE
 WWW=		https://github.com/spyder-ide/spyder-unittest
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyzmq>=0:net/py-pyzmq@${PY_FLAVOR}
 
 USES=		python:3.5+
 USE_PYTHON=	distutils autoplist
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>