diff --git a/www/py-internetarchive/Makefile b/www/py-internetarchive/Makefile
index 4c410c9142ea..56d845e5cd8a 100644
--- a/www/py-internetarchive/Makefile
+++ b/www/py-internetarchive/Makefile
@@ -1,39 +1,37 @@
 PORTNAME=	internetarchive
 DISTVERSIONPREFIX=	v
-DISTVERSION=	5.4.1
+DISTVERSION=	5.8.0
 CATEGORIES=	www python
 #MASTER_SITES=	PYPI # no tests
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Python interface to archive.org
 WWW=		https://github.com/jjjake/internetarchive
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}charset-normalizer>=2.1.1:textproc/py-charset-normalizer@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}docopt>=0.6.0,<0.7.0:devel/py-docopt@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}jsonpatch>=0.4:devel/py-jsonpatch@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.25.0,<3.0.0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}schema>=0.4.0:devel/py-schema@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>=1.13.0,<2.0.0:devel/py-six@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonpatch>=0.4:devel/py-jsonpatch@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.25.0:www/py-requests@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tqdm>=4.0.0:misc/py-tqdm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=1.26.0:net/py-urllib3@${PY_FLAVOR}
 py39_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=3.6.0:devel/py-importlib-metadata@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}responses>=0.20.0:devel/py-responses@${PY_FLAVOR} \
-		ruff>=0.0.269:devel/ruff
+		${PYTHON_PKGNAMEPREFIX}ruff>=0.0.269:devel/py-ruff@${PY_FLAVOR}
 
 USES=		python
-USE_PYTHON=	distutils concurrent autoplist pytest # 15 tests fail, https://github.com/jjjake/internetarchive/issues/596
+USE_PYTHON=	pep517 concurrent autoplist pytest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jjjake
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} PATH=${STAGEDIR}${PREFIX}/bin:${PATH}
 
 NO_ARCH=	yes
 
-# tests as of 5.4.1: 10 failed, 147 passed, 1 warning in 80.14s (0:01:20)
+# tests as of 5.8.0: 14 failed, 237 passed, 37 skipped in 53.13s (known test environment issues)
 
 .include <bsd.port.mk>
diff --git a/www/py-internetarchive/distinfo b/www/py-internetarchive/distinfo
index 189d1d014ef0..5e84308bd89b 100644
--- a/www/py-internetarchive/distinfo
+++ b/www/py-internetarchive/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1752739130
-SHA256 (jjjake-internetarchive-v5.4.1_GH0.tar.gz) = 30008ce77b5033daecce15ea29170c5e23f9da2b1fbd3108c65b702e454020b8
-SIZE (jjjake-internetarchive-v5.4.1_GH0.tar.gz) = 154308
+TIMESTAMP = 1777479719
+SHA256 (jjjake-internetarchive-v5.8.0_GH0.tar.gz) = 573132e52a338f4466b39cc1cfa76b718a7d51861b793583500eb2630fdab162
+SIZE (jjjake-internetarchive-v5.8.0_GH0.tar.gz) = 170811