diff --git a/devel/py-setuptools_scm/Makefile b/devel/py-setuptools_scm/Makefile
index 58a5c111ad98..ed38105484b9 100644
--- a/devel/py-setuptools_scm/Makefile
+++ b/devel/py-setuptools_scm/Makefile
@@ -1,42 +1,44 @@
 PORTNAME=	setuptools_scm
 PORTVERSION=	6.3.2
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Setuptools plugin to manage your versions by scm tags
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tomli>=1.0.0:textproc/py-tomli@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tomli>=1.0.0:textproc/py-tomli@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR}
 TEST_DEPENDS=	git:devel/git \
 		${PY_MERCURIAL} \
 		${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 
 # Workaround to get a 100% working test suite.  This can be removed once
 # https://github.com/pypa/setuptools_scm/issues/353 is solved.
 TEST_ENV=	_PYTEST_SESSION=yes
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=		TOML
 OPTIONS_DEFAULT=	TOML
 
 TOML_DESC=		Support PEP 517/518 (Keep this enabled to avoid build errors)
 TOML_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tomli>=1.0.0:textproc/py-tomli@${PY_FLAVOR}
 
 # Skip integration tests that require a more recent version of py-virtualenv
 post-extract:
 	@${MV} ${WRKSRC}/testing/test_setuptools_support.py ${WRKSRC}/testing/test_setuptools_support.py.dist
 
 do-test:
 	@cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs
 
 .include <bsd.port.mk>
diff --git a/devel/py-setuptools_scm/files/patch-setup.cfg b/devel/py-setuptools_scm/files/patch-setup.cfg
new file mode 100644
index 000000000000..023b8f628e4d
--- /dev/null
+++ b/devel/py-setuptools_scm/files/patch-setup.cfg
@@ -0,0 +1,19 @@
+Avoid errors during runtime if devel/py-packaging is not present.
+
+The package is only required in "_version_cls.py" and falls back to
+devel/py-setuptools (via "try ... except") if it's not available.
+
+This is a workaround to remedy issues with upgrade runs that also update
+devel/py-{packaging,pyparsing} in environments where devel/py-setuptools_scm is
+already present.
+
+--- setup.cfg.orig	2021-12-05 20:43:43 UTC
++++ setup.cfg
+@@ -27,7 +27,6 @@ classifiers = 
+ [options]
+ packages = find:
+ install_requires = 
+-	packaging>=20.0
+ 	setuptools
+ 	tomli>=1.0.0 # keep in sync
+ python_requires = >=3.6