diff --git a/devel/py-pyyaml-include/Makefile b/devel/py-pyyaml-include/Makefile
index a2c09a8e6d50..fe655ede7751 100644
--- a/devel/py-pyyaml-include/Makefile
+++ b/devel/py-pyyaml-include/Makefile
@@ -1,27 +1,34 @@
 # Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	pyyaml-include
 PORTVERSION=	1.2
+PORTREVISION=	1
+DISTVERSIONSUFFIX=	.post2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Extending PyYAML with a custom constructor for including YAML files within YAML files
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>=0:devel/py-setuptools_scm_git_archive@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=3.12<6.0:devel/py-yaml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>=0:devel/py-setuptools_scm_git_archive@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=5.3.1<6.0:devel/py-yaml@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.5+
 USE_PYTHON=	autoplist concurrent distutils
 
 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>
diff --git a/devel/py-pyyaml-include/distinfo b/devel/py-pyyaml-include/distinfo
index 74fa164cefe1..2f3edd9d386f 100644
--- a/devel/py-pyyaml-include/distinfo
+++ b/devel/py-pyyaml-include/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1586366832
-SHA256 (pyyaml-include-1.2.tar.gz) = 2343c4dad744d3ce907ec50683b29b4383c7c967f142275bdad8ed56d4de9d94
-SIZE (pyyaml-include-1.2.tar.gz) = 38924
+TIMESTAMP = 1608730753
+SHA256 (pyyaml-include-1.2.post2.tar.gz) = 60047fc0a186debb9c80b3c3a23ef73b0096f6ee4ab2124b29d642c3fea0aebe
+SIZE (pyyaml-include-1.2.post2.tar.gz) = 42507