diff --git a/devel/py-setuptools-scm8/Makefile b/devel/py-setuptools-scm8/Makefile
index 9578ac45ca95..bb9a391e2501 100644
--- a/devel/py-setuptools-scm8/Makefile
+++ b/devel/py-setuptools-scm8/Makefile
@@ -1,51 +1,54 @@
 PORTNAME=	setuptools-scm
-PORTVERSION=	8.0.4
+PORTVERSION=	8.1.0
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	8
+DISTNAME=	${PORTNAME:C/[-_.]+/_/g}-${DISTVERSION}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Setuptools plugin to manage your versions by scm tags
 WWW=		https://setuptools-scm.readthedocs.io/en/latest/ \
 		https://github.com/pypa/setuptools-scm
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \
 		${PY_TOMLI} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}packaging>=20:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
-		${PY_TOMLI} \
-		${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR}
+		${PY_TOMLI}
 TEST_DEPENDS=	git:devel/git \
 		gpg2:security/gnupg \
 		${PY_MERCURIAL} \
 		${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mypy>=0:devel/py-mypy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rich>=0:textproc/py-rich@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>=0:devel/py-setuptools_scm_git_archive@${PY_FLAVOR}
+		${PY_TYPING_EXTENSIONS}
+#		${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>=0:devel/py-setuptools_scm_git_archive@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517 pytest
 
 NO_ARCH=	yes
 PORTSCOUT=	ignore:1
 
 # test_git_worktree_support		sometimes relative path results
 # test_dump_version_on_old_python	python 3.7 not available
+# test_dump_version_mypy		python 3.8 not available
 # test_not_owner			requires passwordless sudo access
 # test_case_mismatch_on_windows_git	we're not on Windows
 PYTEST_BROKEN_TESTS=	test_git_worktree_support
 PYTEST_IGNORED_TESTS=	test_dump_version_on_old_python \
+			test_dump_version_mypy \
 			test_not_owner \
 			test_case_mismatch_on_windows_git
 
 post-patch:
 	@${REINPLACE_CMD} -e '497,521s|"gpg|"gpg2|' ${WRKSRC}/testing/test_git.py
 	@${REINPLACE_CMD} -e 's/"GIT_SSH", "GIT_SSH_COMMAND"/"GIT_SSH", "GIT_SSH_COMMAND", "GIT_CEILING_DIRECTORIES"/' ${WRKSRC}/src/setuptools_scm/_run_cmd.py
 
 .include <bsd.port.mk>
diff --git a/devel/py-setuptools-scm8/distinfo b/devel/py-setuptools-scm8/distinfo
index 1d68fd7ef35e..eec89ef0164d 100644
--- a/devel/py-setuptools-scm8/distinfo
+++ b/devel/py-setuptools-scm8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1696540413
-SHA256 (setuptools-scm-8.0.4.tar.gz) = b5f43ff6800669595193fd09891564ee9d1d7dcb196cab4b2506d53a2e1c95c7
-SIZE (setuptools-scm-8.0.4.tar.gz) = 74280
+TIMESTAMP = 1770885600
+SHA256 (setuptools_scm-8.1.0.tar.gz) = 42dea1b65771cba93b7a515d65a65d8246e560768a66b9106a592c8e7f26c8a7
+SIZE (setuptools_scm-8.1.0.tar.gz) = 76465