diff --git a/misc/py-spdx-tools/Makefile b/misc/py-spdx-tools/Makefile
index 94eb8e59d0d0..ee13923cd48d 100644
--- a/misc/py-spdx-tools/Makefile
+++ b/misc/py-spdx-tools/Makefile
@@ -1,55 +1,50 @@
 PORTNAME=	spdx-tools
-DISTVERSION=	0.8.3
+DISTVERSION=	0.8.5
 CATEGORIES=	misc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	spdx_tools-${DISTVERSION}
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Parses, validates and creates SPDX documents
 WWW=		https://github.com/spdx/tools-python
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=3.4.3:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \
 		${RUN_DEPENDS}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}xmltodict>=0:devel/py-xmltodict@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rdflib>=0:textproc/py-rdflib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}beartype>=0:devel/py-beartype@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}uritools>=0:net/py-uritools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}license-expression>=0:textproc/py-license-expression@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}semantic-version>=0:devel/py-semantic-version@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tzdata>=0:devel/py-tzdata@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517 pytest
 
 TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} LC_ALL=en_US.UTF-8
 
 NO_ARCH=	yes
-PLIST_FILES=	${PYTHON_SITELIBDIR}/spdx_tools/spdx/parser/tagvalue/parser.out
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	EXAMPLES
 
-pre-build:
-	${SETENVI} PYTHONPATH=${WRKSRC}/src:${PYTHON_LIBDIR} ${PYTHON_CMD} ${FILESDIR}/generate-parser.py
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${FIND} ${WRKSRC}/examples -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${EXAMPLESDIR} \;
-	${INSTALL_DATA} ${WRKSRC}/src/spdx_tools/spdx/parser/tagvalue/parser.out \
-		${STAGEDIR}${PYTHON_SITELIBDIR}/spdx_tools/spdx/parser/tagvalue
 
 # This test requires https://github.com/RDFLib/pySHACL, which is not currently
 # in the ports tree. Using PYTEST_IGNORED_TESTS doesn't seem to work in this
 # case, so just delete it for now so that the other tests pass.
 pre-test:
 	${RM} ${WRKSRC}/tests/spdx3/validation/json_ld/test_shacl_validation.py
 
 .include <bsd.port.mk>
diff --git a/misc/py-spdx-tools/distinfo b/misc/py-spdx-tools/distinfo
index 30382b146207..14b9d3b73ec0 100644
--- a/misc/py-spdx-tools/distinfo
+++ b/misc/py-spdx-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1737794656
-SHA256 (spdx-tools-0.8.3.tar.gz) = 68b8f9ce2893b5216bd90b2e63f1c821c2884e4ebc4fd295ebbf1fa8b8a94b93
-SIZE (spdx-tools-0.8.3.tar.gz) = 681626
+TIMESTAMP = 1773749793
+SHA256 (spdx_tools-0.8.5.tar.gz) = be600beb2f762f0116025e05490d399e724f668bef84025a7c421bb266688bdb
+SIZE (spdx_tools-0.8.5.tar.gz) = 696323
diff --git a/misc/py-spdx-tools/files/generate-parser.py b/misc/py-spdx-tools/files/generate-parser.py
deleted file mode 100644
index 08f9c64cc5ed..000000000000
--- a/misc/py-spdx-tools/files/generate-parser.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Pre-generate a few files to avoid fs-violations in poudriere:
-#
-# ${PYTHON_SITELIBDIR}/spdx_tools/spdx/parser/tagvalue/parser.out
-# ${PYTHON_SITELIBDIR}/spdx_tools/spdx/parser/tagvalue/parser.py
-#
-
-import spdx_tools.spdx.parser.tagvalue.tagvalue_parser as tvp
-
-tvp.Parser()
diff --git a/misc/py-spdx-tools/files/patch-pyproject.toml b/misc/py-spdx-tools/files/patch-pyproject.toml
new file mode 100644
index 000000000000..995999801441
--- /dev/null
+++ b/misc/py-spdx-tools/files/patch-pyproject.toml
@@ -0,0 +1,22 @@
+Enable build for older versions of py-setuptools
+
+--- pyproject.toml.orig	2026-03-17 12:26:32 UTC
++++ pyproject.toml
+@@ -9,7 +9,6 @@ maintainers = [
+     { name = "Philippe Ombredanne", email = "pombredanne@gmail.com" },
+     { name = "SPDX group at the Linux Foundation and others" },
+ ]
+-license = "Apache-2.0"
+ description = "SPDX parser and tools."
+ readme = "README.md"
+ classifiers = [
+@@ -41,6 +40,9 @@ dynamic = ["version"]
+     "xmltodict",
+ ]
+ dynamic = ["version"]
++
++[project.license]
++text = "Apache-2.0"
+ 
+ [project.optional-dependencies]
+ test = ["pyshacl", "pytest", "tzdata"]