diff --git a/devel/py-packaging/Makefile b/devel/py-packaging/Makefile
index 1fcac8220005..954cfacd093a 100644
--- a/devel/py-packaging/Makefile
+++ b/devel/py-packaging/Makefile
@@ -1,24 +1,25 @@
 # Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
 
 PORTNAME=	packaging
 PORTVERSION=	21.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Core utilities for Python packages
 
 LICENSE=	APACHE20 BSD2CLAUSE
 LICENSE_COMB=	dual
 LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE.APACHE
 LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/LICENSE.BSD
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.2<3:devel/py-pyparsing@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyparsing>=2.0.2:devel/py-pyparsing@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/py-packaging/files/patch-setup.py b/devel/py-packaging/files/patch-setup.py
new file mode 100644
index 000000000000..c96dd1ab8c20
--- /dev/null
+++ b/devel/py-packaging/files/patch-setup.py
@@ -0,0 +1,13 @@
+Obtained from:  https://github.com/pypa/packaging/commit/8cb9dbf19e2b76ab025efc11208bd50e09e8223e
+
+--- setup.py.orig	2021-10-29 11:19:27 UTC
++++ setup.py
+@@ -48,7 +48,7 @@ setup(
+     author=about["__author__"],
+     author_email=about["__email__"],
+     python_requires=">=3.6",
+-    install_requires=["pyparsing>=2.0.2,<3"],  # Needed to avoid issue #91
++    install_requires=["pyparsing>=2.0.2"],  # Needed to avoid issue #91
+     classifiers=[
+         "Development Status :: 5 - Production/Stable",
+         "Intended Audience :: Developers",
diff --git a/devel/py-packaging/files/patch-tests-test_requirements.py b/devel/py-packaging/files/patch-tests-test_requirements.py
new file mode 100644
index 000000000000..689bc638086e
--- /dev/null
+++ b/devel/py-packaging/files/patch-tests-test_requirements.py
@@ -0,0 +1,12 @@
+Obtained from:  https://github.com/pypa/packaging/commit/8cb9dbf19e2b76ab025efc11208bd50e09e8223e
+
+--- tests/test_requirements.py.orig	2021-07-23 07:28:49 UTC
++++ tests/test_requirements.py
+@@ -192,4 +192,6 @@ class TestRequirements:
+     def test_parseexception_error_msg(self):
+         with pytest.raises(InvalidRequirement) as e:
+             Requirement("toto 42")
+-        assert "Expected stringEnd" in str(e.value)
++        assert "Expected stringEnd" in str(e.value) or (
++            "Expected string_end" in str(e.value)  # pyparsing>=3.0.0
++        )