diff --git a/devel/py-lxml/Makefile b/devel/py-lxml/Makefile
index 9e4c29fcbef4..e444b1aed608 100644
--- a/devel/py-lxml/Makefile
+++ b/devel/py-lxml/Makefile
@@ -1,61 +1,55 @@
 PORTNAME=	lxml
-PORTVERSION=	4.9.3
-PORTREVISION=	2
+DISTVERSION=	6.0.0
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	vishwin@FreeBSD.org
 COMMENT=	Pythonic binding for the libxml2 and libxslt libraries
 WWW=		https://lxml.de/ \
 		https://github.com/lxml/lxml
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/doc/licenses/BSD.txt
 
-USES=		compiler cpe gnome python uniquefiles:dirs
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+
+USES=		compiler cpe gnome python
 USE_GNOME=	libxml2 libxslt
-USE_PYTHON=	autoplist concurrent cython distutils
+USE_PYTHON=	autoplist concurrent cython3 pep517
 
 LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/lib
 
 DOCS_FILES=	CHANGES.txt CREDITS.txt TODO.txt README.rst
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
-# needed for test to work
-PYDISTUTILS_BUILD_TARGET=	build_ext
-PYDISTUTILS_BUILDARGS=		--inplace
-
 # force regeneration of cython files
 post-extract:
 	@${FIND} ${WRKSRC} -name "*.c" -delete
 
-pre-configure: # remove with update to 5.x
-	@if ! xml2-config --version | ${GREP} -q ^2\.11; then \
-		${REINPLACE_CMD} -e 's|, xmlerror.xmlError\*|, const xmlerror.xmlError*|' \
-			${WRKSRC}/src/lxml/*.pxi; \
-	fi
-
 post-install:
-	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \
-		-name '*.so' -exec ${STRIP_CMD} {} +
+	@${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name '*.so' -exec ${STRIP_CMD} {} +
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS_FILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR}
 
 # see upstream Makefile, test target
+# tests require compiled extensions in the source directories
 do-test:
-	cd ${WRKSRC} && ${PYTHON_CMD} test.py -p -v
+	cd ${BUILD_WRKSRC} && \
+		${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} build_ext --inplace && \
+		${PYTHON_CMD} test.py -p -v
 
 .include <bsd.port.pre.mk>
 
 # if using gcc, force modern GCC due to use of #pragma
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 USE_GCC=	yes
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/py-lxml/distinfo b/devel/py-lxml/distinfo
index 5c3140b5c9df..dc617269eb97 100644
--- a/devel/py-lxml/distinfo
+++ b/devel/py-lxml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1690387655
-SHA256 (lxml-4.9.3.tar.gz) = 48628bd53a426c9eb9bc066a923acaa0878d1e86129fd5359aee99285f4eed9c
-SIZE (lxml-4.9.3.tar.gz) = 3572158
+TIMESTAMP = 1752123348
+SHA256 (lxml-6.0.0.tar.gz) = 032e65120339d44cdc3efc326c9f660f5f7205f3a535c1fdbf898b29ea01fb72
+SIZE (lxml-6.0.0.tar.gz) = 4096938
diff --git a/devel/py-lxml/files/patch-src_lxml_tests_test__etree.py b/devel/py-lxml/files/patch-src_lxml_tests_test__etree.py
deleted file mode 100644
index 366d829f1f0c..000000000000
--- a/devel/py-lxml/files/patch-src_lxml_tests_test__etree.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/lxml/tests/test_etree.py.orig	2023-07-05 10:03:51 UTC
-+++ src/lxml/tests/test_etree.py
-@@ -3068,6 +3068,7 @@ class ETreeOnlyTestCase(HelperTestCase):
-         self.assertEqual(r,  s.nsmap)
- 
-     def test_html_prefix_nsmap(self):
-+        return  # broken with recent libxml2, probably fixed by https://github.com/lxml/lxml/commit/72f5a287a4016ecb405f2e8a4a03ae22a5b0b496
-         etree = self.etree
-         el = etree.HTML('<hha:page-description>aa</hha:page-description>').find('.//page-description')
-         if etree.LIBXML_VERSION < (2, 9, 11):