diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile
index 5ef27804bd58..731e87eaf3fe 100644
--- a/devel/mercurial/Makefile
+++ b/devel/mercurial/Makefile
@@ -1,82 +1,86 @@
 PORTNAME=	mercurial
 PORTVERSION=	6.3.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	https://www.mercurial-scm.org/release/
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Fast, lightweight source control management system
 WWW=		https://www.mercurial-scm.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cpe python:3.7+ shebangfix
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+
+USES=		cpe python shebangfix
 SHEBANG_FILES=	contrib/hgweb.fcgi hgweb.cgi
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist pep517
 
 OPTIONS_DEFINE=		CA_BUNDLE DATA DOCS NLS FREEBSD
 OPTIONS_DEFAULT=	CA_BUNDLE DATA
 OPTIONS_SUB=		yes
 
 CA_BUNDLE_DESC=		Install CA Certificates
 CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 DATA_SUB_FILES=		pkg-message
 FREEBSD_DESC=		Patches used internally by the FreeBSD Project
 FREEBSD_EXTRA_PATCHES=	${FILESDIR}/extra-patch-authormapsuffix
 NLS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-setup.py
 NLS_USES=		gettext
 
 CONTRIB_FILES=	bash_completion \
 		casesmash.py \
 		check-code.py \
 		debugcmdserver.py \
 		debugshell.py \
 		dumprevlog \
 		hg-ssh \
 		hgk \
 		hgsh/Makefile \
 		hgsh/hgsh.c \
 		mercurial.el \
 		mq.el \
 		pylintrc \
 		python-hook-examples.py \
 		simplemerge \
 		tcsh_completion \
 		tcsh_completion_build.sh \
 		undumprevlog \
 		zsh_completion \
 		vim/HGAnnotate.vim \
 		vim/hg-menu.vim \
 		vim/hgcommand.vim \
 		vim/hgtest.vim \
 		vim/patchreview.txt \
 		vim/patchreview.vim
 PORTDOCS=	CONTRIBUTORS README.rst
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_VER} != ${PYTHON_DEFAULT}
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 .endif
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/doc/*.5 ${STAGEDIR}${PREFIX}/man/man5/
-	${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/ -name '*.so' -exec ${STRIP_CMD} {} +
+	${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ -name '*.so' -exec ${STRIP_CMD} {} +
 
 post-install-DATA-on:
 .for d in hgsh vim
 	${MKDIR} ${STAGEDIR}${DATADIR}/contrib/${d}
 .endfor
 	${MKDIR} ${STAGEDIR}${DATADIR}/www
 .for f in ${CONTRIB_FILES}
 	${INSTALL_DATA} ${WRKSRC}/contrib/${f} \
 		${STAGEDIR}${DATADIR}/contrib/${f}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/hgweb.cgi ${WRKSRC}/contrib/hgweb.* ${STAGEDIR}${DATADIR}/www
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.post.mk>
diff --git a/devel/mercurial/pkg-plist b/devel/mercurial/pkg-plist
index 147e99370cc0..5cbff357edfd 100644
--- a/devel/mercurial/pkg-plist
+++ b/devel/mercurial/pkg-plist
@@ -1,36 +1,31 @@
-%%PYTHON_SITELIBDIR%%/mercurial/__modulepolicy__.py
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/mercurial/__modulepolicy__.pyc
-%%PYTHON2%%%%PYTHON_SITELIBDIR%%/mercurial/__modulepolicy__.pyo
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/mercurial/__pycache__/__modulepolicy__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/mercurial/__pycache__/__modulepolicy__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%DATA%%%%DATADIR%%/contrib/bash_completion
 %%DATA%%%%DATADIR%%/contrib/casesmash.py
 %%DATA%%%%DATADIR%%/contrib/check-code.py
 %%DATA%%%%DATADIR%%/contrib/debugcmdserver.py
 %%DATA%%%%DATADIR%%/contrib/debugshell.py
 %%DATA%%%%DATADIR%%/contrib/dumprevlog
 %%DATA%%%%DATADIR%%/contrib/hg-ssh
 %%DATA%%%%DATADIR%%/contrib/hgk
 %%DATA%%%%DATADIR%%/contrib/hgsh/hgsh.c
 %%DATA%%%%DATADIR%%/contrib/hgsh/Makefile
 %%DATA%%%%DATADIR%%/contrib/mercurial.el
 %%DATA%%%%DATADIR%%/contrib/mq.el
 %%DATA%%%%DATADIR%%/contrib/pylintrc
 %%DATA%%%%DATADIR%%/contrib/python-hook-examples.py
 %%DATA%%%%DATADIR%%/contrib/simplemerge
 %%DATA%%%%DATADIR%%/contrib/tcsh_completion
 %%DATA%%%%DATADIR%%/contrib/tcsh_completion_build.sh
 %%DATA%%%%DATADIR%%/contrib/undumprevlog
 %%DATA%%%%DATADIR%%/contrib/vim/hg-menu.vim
 %%DATA%%%%DATADIR%%/contrib/vim/HGAnnotate.vim
 %%DATA%%%%DATADIR%%/contrib/vim/hgcommand.vim
 %%DATA%%%%DATADIR%%/contrib/vim/hgtest.vim
 %%DATA%%%%DATADIR%%/contrib/vim/patchreview.txt
 %%DATA%%%%DATADIR%%/contrib/vim/patchreview.vim
 %%DATA%%%%DATADIR%%/contrib/zsh_completion
 %%DATA%%%%DATADIR%%/www/hgweb.cgi
 %%DATA%%%%DATADIR%%/www/hgweb.fcgi
 %%DATA%%%%DATADIR%%/www/hgweb.wsgi
 man/man1/hg.1.gz
 man/man5/hgignore.5.gz
 man/man5/hgrc.5.gz