diff --git a/devel/py-flit/Makefile b/devel/py-flit/Makefile
index f958083b415a..c8b2b4ff3722 100644
--- a/devel/py-flit/Makefile
+++ b/devel/py-flit/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	flit
 PORTVERSION=	3.8.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,6 +12,7 @@ WWW=		https://github.com/pypa/flit
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flit-core>=${PORTVERSION}<4:devel/py-flit-core@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0,1:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flit-core>=${PORTVERSION}:devel/py-flit-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
@@ -18,11 +20,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0,1:textproc/py-docutils@${PY_FLAV
 		${PYTHON_PKGNAMEPREFIX}tomli-w>=0:textproc/py-tomli-w@${PY_FLAVOR}
 
 USES=		python:3.7+
-USE_PYTHON=	autoplist concurrent distutils
+USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
-post-patch:
-	@${SED} -e 's|%%PORTVERSION%%|${PORTVERSION}|' ${FILESDIR}/setup.py > ${WRKSRC}/setup.py
-
 .include <bsd.port.mk>
diff --git a/devel/py-flit/files/setup.py b/devel/py-flit/files/setup.py
deleted file mode 100644
index a9b2761d8aeb..000000000000
--- a/devel/py-flit/files/setup.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env python
-# setup.py generated by flit for tools that don't yet use PEP 517
-
-from distutils.core import setup
-
-packages = \
-['flit', 'flit.vcs', 'flit.vendorized', 'flit.vendorized.readme']
-
-package_data = \
-{'': ['*'], 'flit': ['license_templates/*']}
-
-install_requires = \
-['flit_core >= %%PORTVERSION%%', 'requests', 'docutils', 'tomli-w']
-
-extras_require = \
-{'doc': ['sphinx', 'sphinxcontrib_github_alt', 'pygments-github-lexers'],
- 'test': ['testpath', 'responses', 'pytest>=2.7.3', 'pytest-cov', 'tomli']}
-
-entry_points = \
-{'console_scripts': ['flit = flit:main']}
-
-setup(name='flit',
-      version='%%PORTVERSION%%',
-      description='A simple packaging tool for simple packages.',
-      author=None,
-      author_email='Thomas Kluyver <thomas@kluyver.me.uk>',
-      url=None,
-      packages=packages,
-      package_data=package_data,
-      install_requires=install_requires,
-      extras_require=extras_require,
-      entry_points=entry_points,
-      python_requires='>=3.6',
-     )