diff --git a/devel/py-pyyaml/Makefile b/devel/py-pyyaml/Makefile
index 3abb74d33f10..fe875595a75d 100644
--- a/devel/py-pyyaml/Makefile
+++ b/devel/py-pyyaml/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	pyyaml
 DISTVERSION=	6.0.3
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Python YAML parser
 WWW=		https://pyyaml.org/
 
 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}
+
 USES=		cpe localbase python
-USE_PYTHON=	autoplist concurrent cython distutils
+USE_PYTHON=	autoplist concurrent cython pep517 pytest
 
 OPTIONS_DEFINE=	LIBYAML EXAMPLES
 OPTIONS_DEFAULT=LIBYAML
 LIBYAML_DESC=	Use textproc/libyaml for faster parsing
 
 LIBYAML_LIB_DEPENDS=	libyaml.so:textproc/libyaml
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MLIBYAML}
-PYDISTUTILS_SETUP+=		--with-libyaml
-PYDISTUTILS_BUILD_TARGET=	build_ext
-PYDISTUTILS_BUILDARGS+=		--include-dirs=${LOCALBASE}/include \
-				--library-dirs=${LOCALBASE}/lib
+PEP517_BUILD_CONFIG_SETTING=	--config-json '{"pyyaml_build_config": "{\"include_dirs\": [\"${LOCALBASE}/include\"], \"library_dirs\": [\"${LOCALBASE}/lib\"]}"}'
+MAKE_ENV+=			PYYAML_FORCE_LIBYAML=1
 .else
-PYDISTUTILS_SETUP+=		--without-libyaml
+MAKE_ENV+=			PYYAML_FORCE_LIBYAML=0
 NO_ARCH=			yes
 .endif
 
 post-install-EXAMPLES-on:
 	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/)
 
 post-install-LIBYAML-on:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/yaml/_yaml*.so
 
-do-test:
-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
-
 .include <bsd.port.post.mk>
+
diff --git a/devel/py-pyyaml/files/patch-setup.py b/devel/py-pyyaml/files/patch-setup.py
new file mode 100644
index 000000000000..b4cc273ef940
--- /dev/null
+++ b/devel/py-pyyaml/files/patch-setup.py
@@ -0,0 +1,10 @@
+--- setup.py.orig	2026-08-15 00:00:00 UTC
++++ setup.py
+@@ -1,5 +1,5 @@
+
+-NAME = 'PyYAML'
++NAME = 'pyyaml'
+ VERSION = '6.0.3'
+ DESCRIPTION = "YAML parser and emitter for Python"
+ LONG_DESCRIPTION = """\
+