diff --git a/devel/py-pyyaml-include/Makefile b/devel/py-pyyaml-include/Makefile
index f3d574c8c328..f3cb98d7e5db 100644
--- a/devel/py-pyyaml-include/Makefile
+++ b/devel/py-pyyaml-include/Makefile
@@ -1,33 +1,39 @@
 PORTNAME=	pyyaml-include
-PORTVERSION=	1.3
-PORTREVISION=	2
+PORTVERSION=	2.0
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Extending PyYAML with a custom constructor for including YAML files within YAML files
-WWW=		https://github.com/tanbro/pyyaml-include
+WWW=		https://pyyaml-include.readthedocs.io/en/latest/ \
+		https://github.com/tanbro/pyyaml-include
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PY_SETUPTOOLS} \
-		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=3.4:devel/py-setuptools-scm@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>=1.1:devel/py-setuptools_scm_git_archive@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=8:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=5.1<7.0:devel/py-yaml@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}fsspec>=2021.04.0:devel/py-fsspec@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>=6.0<7.0:devel/py-yaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	TOML
 OPTIONS_DEFAULT=TOML
 TOML_DESC=	TOML (Tom's Obvious, Minimal Language) support
 
 TOML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 31100
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/py-pyyaml-include/distinfo b/devel/py-pyyaml-include/distinfo
index 18c1d025a5b6..f029d80ead9f 100644
--- a/devel/py-pyyaml-include/distinfo
+++ b/devel/py-pyyaml-include/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1653151118
-SHA256 (pyyaml-include-1.3.tar.gz) = f7fbeb8e71b50be0e6e07472f7c79dbfb1a15bade9c93a078369ff49e57e6771
-SIZE (pyyaml-include-1.3.tar.gz) = 42733
+TIMESTAMP = 1712084510
+SHA256 (pyyaml-include-2.0.tar.gz) = e826f0b3121a3818e04a0f45169a8af59b90961a91c7f4984086226c6c72e600
+SIZE (pyyaml-include-2.0.tar.gz) = 28445
diff --git a/devel/py-pyyaml-include/files/patch-pyproject.toml b/devel/py-pyyaml-include/files/patch-pyproject.toml
new file mode 100644
index 000000000000..32ae890399d7
--- /dev/null
+++ b/devel/py-pyyaml-include/files/patch-pyproject.toml
@@ -0,0 +1,10 @@
+--- pyproject.toml.orig	2024-04-01 10:29:21 UTC
++++ pyproject.toml
+@@ -1,6 +1,6 @@ build-backend = "setuptools.build_meta"
+ [build-system]
+ build-backend = "setuptools.build_meta"
+-requires = ["setuptools>=64", "setuptools-scm>=8"]
++requires = ["setuptools>=61", "setuptools-scm>=8"]
+ 
+ [project]
+ authors = [{ name = "liu xue yan", email = "liu_xue_yan@foxmail.com" }]