diff --git a/textproc/py-sphinx-autoapi/Makefile b/textproc/py-sphinx-autoapi/Makefile
index e44fcb574783..0342e45cfc17 100644
--- a/textproc/py-sphinx-autoapi/Makefile
+++ b/textproc/py-sphinx-autoapi/Makefile
@@ -1,23 +1,26 @@
 PORTNAME=	sphinx-autoapi
-PORTVERSION=	1.7.0
+PORTVERSION=	1.8.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}
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=3.0,1:textproc/py-sphinx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}astroid>=2.4:devel/py-astroid@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unidecode>0:converters/py-unidecode@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/py-sphinx-autoapi/distinfo b/textproc/py-sphinx-autoapi/distinfo
index 7878ac1f0112..f29b1a03358c 100644
--- a/textproc/py-sphinx-autoapi/distinfo
+++ b/textproc/py-sphinx-autoapi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613205264
-SHA256 (sphinx-autoapi-1.7.0.tar.gz) = 48caa054a99c21156e9a1d26559281dc27f86ab8ef8bb6ef160f8cd9f4a0053d
-SIZE (sphinx-autoapi-1.7.0.tar.gz) = 42148159
+TIMESTAMP = 1618749209
+SHA256 (sphinx-autoapi-1.8.0.tar.gz) = 51ff98016e51edfa98c03bb829a9843a4add37184c199bcd95b6b1da8cc6a74c
+SIZE (sphinx-autoapi-1.8.0.tar.gz) = 42150679
diff --git a/textproc/py-sphinx-autoapi/files/patch-setup.py b/textproc/py-sphinx-autoapi/files/patch-setup.py
new file mode 100644
index 000000000000..135bf01395a9
--- /dev/null
+++ b/textproc/py-sphinx-autoapi/files/patch-setup.py
@@ -0,0 +1,8 @@
+--- 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)