diff --git a/textproc/py-sphinx-autoapi/Makefile b/textproc/py-sphinx-autoapi/Makefile
index 50a783d4ecaf..251ab63a4a3f 100644
--- a/textproc/py-sphinx-autoapi/Makefile
+++ b/textproc/py-sphinx-autoapi/Makefile
@@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.8 2022/01/04 20:55:05 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2023/05/06 08:39:03 wiz Exp $
 
-DISTNAME=	sphinx-autoapi-1.8.4
+DISTNAME=	sphinx-autoapi-2.1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/sphinx-autoapi/}
 
 MAINTAINER=	minskim@NetBSD.org
 HOMEPAGE=	https://github.com/readthedocs/sphinx-autoapi
-COMMENT=	Autodoc style documenation for multiple languages
+COMMENT=	Autodoc style documentation for multiple languages
 LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-astroid>=2.7:../../devel/py-astroid
-DEPENDS+=	${PYPKGPREFIX}-sphinx>=3.0:../../textproc/py-sphinx
+DEPENDS+=	${PYPKGPREFIX}-sphinx>=5.2:../../textproc/py-sphinx
 DEPENDS+=	${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
 DEPENDS+=	${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 DEPENDS+=	${PYPKGPREFIX}-Unidecode-[0-9]*:../../textproc/py-Unidecode
@@ -23,6 +22,7 @@ USE_LANGUAGES=	# none
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 
+TEST_ENV+=	PYTHONPATH=${WRKSRC}/build/lib
 do-test:
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} tests
 
diff --git a/textproc/py-sphinx-autoapi/PLIST b/textproc/py-sphinx-autoapi/PLIST
index d1ca85adeb67..f1076843ef65 100644
--- a/textproc/py-sphinx-autoapi/PLIST
+++ b/textproc/py-sphinx-autoapi/PLIST
@@ -1,9 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2021/04/16 06:02:44 adam Exp $
-${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
-${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
-${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/requires.txt
-${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+@comment $NetBSD: PLIST,v 1.4 2023/05/06 08:39:03 wiz Exp $
 ${PYSITELIB}/autoapi/__init__.py
 ${PYSITELIB}/autoapi/__init__.pyc
 ${PYSITELIB}/autoapi/__init__.pyo
@@ -91,6 +86,9 @@ ${PYSITELIB}/autoapi/templates/python/function.rst
 ${PYSITELIB}/autoapi/templates/python/method.rst
 ${PYSITELIB}/autoapi/templates/python/module.rst
 ${PYSITELIB}/autoapi/templates/python/package.rst
-${PYSITELIB}/autoapi/toctree.py
-${PYSITELIB}/autoapi/toctree.pyc
-${PYSITELIB}/autoapi/toctree.pyo
+${PYSITELIB}/autoapi/templates/python/property.rst
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
diff --git a/textproc/py-sphinx-autoapi/distinfo b/textproc/py-sphinx-autoapi/distinfo
index 4b1d52c93b03..011d7b55993b 100644
--- a/textproc/py-sphinx-autoapi/distinfo
+++ b/textproc/py-sphinx-autoapi/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 11:23:13 nia Exp $
+$NetBSD: distinfo,v 1.10 2023/05/06 08:39:03 wiz Exp $
 
-BLAKE2s (sphinx-autoapi-1.8.4.tar.gz) = 6d1014c9a3ef77f6a003c6f87ca938db5c22ff130ff42a06d6954ffd9e682754
-SHA512 (sphinx-autoapi-1.8.4.tar.gz) = 0ff2ab427c942d2f64d0f5c2986f9bf18cfc194824e194051232d34d15955d70f5c3f0e760e8765d39e98276ff4354ac705287dc1be2b8df40ecfe72a436087d
-Size (sphinx-autoapi-1.8.4.tar.gz) = 42152704 bytes
+BLAKE2s (sphinx-autoapi-2.1.0.tar.gz) = 51201fd7aa43751770207a2cc821b4b030c0fb76e6dcf8ca917f35042018a588
+SHA512 (sphinx-autoapi-2.1.0.tar.gz) = 7d5fe4b52dc1071c0fcbbb316bfcf1b0a33c291834e50614e2ec6baf43bfb4938b27b9f39fca4d241b4624619e0a7623d85cdf1e7c5c531674cb895f839ac14b
+Size (sphinx-autoapi-2.1.0.tar.gz) = 42158330 bytes