diff --git a/devel/py-yaml/Makefile b/devel/py-yaml/Makefile
index bd29aee3c8ab..b17f531e4fc0 100644
--- a/devel/py-yaml/Makefile
+++ b/devel/py-yaml/Makefile
@@ -1,46 +1,47 @@
 PORTNAME=	yaml
-PORTVERSION=	5.4.1
+PORTVERSION=	6.0
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	PyYAML-${PORTVERSION}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Python YAML parser
 WWW=		https://pyyaml.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils cython
+USE_PYTHON=	autoplist concurrent cython distutils
 
-OPTIONS_DEFINE=	LIBYAML EXAMPLES
-OPTIONS_DEFAULT=	LIBYAML
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}pyyaml5
 
+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
 .else
 PYDISTUTILS_SETUP+=		--without-libyaml
 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-yaml/distinfo b/devel/py-yaml/distinfo
index d2b4d347de18..ec60bd6da0d7 100644
--- a/devel/py-yaml/distinfo
+++ b/devel/py-yaml/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622221237
-SHA256 (PyYAML-5.4.1.tar.gz) = 607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e
-SIZE (PyYAML-5.4.1.tar.gz) = 175147
+TIMESTAMP = 1675104137
+SHA256 (PyYAML-6.0.tar.gz) = 68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2
+SIZE (PyYAML-6.0.tar.gz) = 124996