diff --git a/textproc/py-sphinx-autoapi/Makefile b/textproc/py-sphinx-autoapi/Makefile
index 2cca742c6abf..cc28a58fee92 100644
--- a/textproc/py-sphinx-autoapi/Makefile
+++ b/textproc/py-sphinx-autoapi/Makefile
@@ -1,27 +1,26 @@
 PORTNAME=	sphinx-autoapi
-PORTVERSION=	1.8.4
+DISTVERSION=	1.9.0
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	andreas@bilke.org
 COMMENT=	Sphinx API documentation generator
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.rst
 
-# Upstream switched to PEP-517 packaging
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.15.0:devel/py-setuptools_scm@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR}
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}astroid>=2.7:devel/py-astroid@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx>=3.0:textproc/py-sphinx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unidecode>0:converters/py-unidecode@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 
-USES=		python:3.6+
+USES=		python:3.7+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-sphinx-autoapi/distinfo b/textproc/py-sphinx-autoapi/distinfo
index b7b48ab4654f..fc146353c11d 100644
--- a/textproc/py-sphinx-autoapi/distinfo
+++ b/textproc/py-sphinx-autoapi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630237683
-SHA256 (sphinx-autoapi-1.8.4.tar.gz) = 8c4ec5fbedc1e6e8f4692bcc4fcd1abcfb9e8dfca8a4ded60ad811a743c22ccc
-SIZE (sphinx-autoapi-1.8.4.tar.gz) = 42152704
+TIMESTAMP = 1658827293
+SHA256 (sphinx-autoapi-1.9.0.tar.gz) = c897ea337df16ad0cde307cbdfe2bece207788dde1587fa4fc8b857d1fc5dcba
+SIZE (sphinx-autoapi-1.9.0.tar.gz) = 42158275
diff --git a/textproc/py-sphinx-autoapi/files/patch-setup.py b/textproc/py-sphinx-autoapi/files/patch-setup.py
deleted file mode 100644
index 135bf01395a9..000000000000
--- a/textproc/py-sphinx-autoapi/files/patch-setup.py
+++ /dev/null
@@ -1,8 +0,0 @@
---- setup.py.orig	2021-04-05 03:23:24 UTC
-+++ setup.py
-@@ -1,2 +1,4 @@
-+# Upstream switched to PEP-517 packaging
- from setuptools import setup
--setup()
-+if __name__ == "__main__":
-+    setup(use_scm_version=True)