diff --git a/www/py-mechanicalsoup/Makefile b/www/py-mechanicalsoup/Makefile
index a6056416b70a..2aa0389e59e4 100644
--- a/www/py-mechanicalsoup/Makefile
+++ b/www/py-mechanicalsoup/Makefile
@@ -1,28 +1,31 @@
 PORTNAME=	mechanicalsoup
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	MechanicalSoup-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python library for automating interaction with websites
 WWW=		https://github.com/MechanicalSoup/MechanicalSoup
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.7:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests-mock>=0:www/py-requests-mock@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	autoplist concurrent distutils
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/www/py-mechanicalsoup/files/patch-setup.py b/www/py-mechanicalsoup/files/patch-setup.py
new file mode 100644
index 000000000000..e21c791797e4
--- /dev/null
+++ b/www/py-mechanicalsoup/files/patch-setup.py
@@ -0,0 +1,11 @@
+--- setup.py.orig	2023-07-04 19:21:51 UTC
++++ setup.py
+@@ -42,7 +42,7 @@ setup(
+ pytest_runner = ['pytest-runner'] if needs_pytest else []
+ 
+ setup(
+-    name=about['__title__'],
++    name='mechanicalsoup',
+ 
+     # useful: python setup.py sdist bdist_wheel upload
+     version=about['__version__'],