diff --git a/textproc/py-openstackdocstheme/Makefile b/textproc/py-openstackdocstheme/Makefile
index f90751ed4795..64b6889b2ccf 100644
--- a/textproc/py-openstackdocstheme/Makefile
+++ b/textproc/py-openstackdocstheme/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	openstackdocstheme
-DISTVERSION=	1.21.0
+DISTVERSION=	2.2.7
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,23 +15,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dulwich>=0.15.0:devel/dulwich@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sphinx18>=0:textproc/py-sphinx18@${PY_FLAVOR}
+		${PY_SPHINX}
 
 USES=		python:3.6+
 USE_PYTHON=	distutils concurrent autoplist
 
 NO_ARCH=	yes
-PORTDOCS=	*
-
-OPTIONS_DEFINE=	DOCS
-DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx18>=0:textproc/py-sphinx18@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}dulwich>=0.15.0:devel/dulwich@${PY_FLAVOR}
-DOCS_VARS=		PYDISTUTILS_BUILD_TARGET+="build_sphinx -a -E"
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/doc/build/html && \
-		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
-			"! -name .buildinfo -and ! -name objects.inv")
 
 .include <bsd.port.mk>
diff --git a/textproc/py-openstackdocstheme/distinfo b/textproc/py-openstackdocstheme/distinfo
index 2834c81928c2..f7bb76643c09 100644
--- a/textproc/py-openstackdocstheme/distinfo
+++ b/textproc/py-openstackdocstheme/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527880367
-SHA256 (openstackdocstheme-1.21.0.tar.gz) = 20df88482739f76c9007385c6314de7b787ad5c7bdcd23df5aa5c9c012f32d92
-SIZE (openstackdocstheme-1.21.0.tar.gz) = 1191580
+TIMESTAMP = 1610313875
+SHA256 (openstackdocstheme-2.2.7.tar.gz) = beacfc00277337c733c1e48ace1cdeb598faf5718609b638972d72fe04bf6372
+SIZE (openstackdocstheme-2.2.7.tar.gz) = 1255666
diff --git a/textproc/py-openstackdocstheme/files/patch-openstackdocstheme_ext.py b/textproc/py-openstackdocstheme/files/patch-openstackdocstheme_ext.py
deleted file mode 100644
index d72e926b031f..000000000000
--- a/textproc/py-openstackdocstheme/files/patch-openstackdocstheme_ext.py
+++ /dev/null
@@ -1,23 +0,0 @@
---- openstackdocstheme/ext.py.orig	2018-03-29 20:08:16 UTC
-+++ openstackdocstheme/ext.py
-@@ -95,13 +95,13 @@ def _html_page_context(app, pagename, te
-     global _html_context_data
-     if _html_context_data is None:
-         _html_context_data = {}
--        try:
--            _html_context_data['gitsha'] = subprocess.check_output(
--                ['git', 'rev-parse', 'HEAD'],
--            ).decode('utf-8').strip()
--        except Exception:
--            logger.warning('Cannot get gitsha from git repository.')
--            _html_context_data['gitsha'] = 'unknown'
-+        #try:
-+        #    _html_context_data['gitsha'] = subprocess.check_output(
-+        #        ['git', 'rev-parse', 'HEAD'],
-+        #    ).decode('utf-8').strip()
-+        #except Exception:
-+        #    logger.warning('Cannot get gitsha from git repository.')
-+        _html_context_data['gitsha'] = 'unknown'
- 
-         doc_path = _get_doc_path(app)
-         repo_name = app.config.repository_name
diff --git a/textproc/py-openstackdocstheme/files/patch-setup.cfg b/textproc/py-openstackdocstheme/files/patch-setup.cfg
new file mode 100644
index 000000000000..44dd69e2b362
--- /dev/null
+++ b/textproc/py-openstackdocstheme/files/patch-setup.cfg
@@ -0,0 +1,20 @@
+Remove scripts because these contain additional, undocumented dependencies and
+are not required as the package is used only as a library.
+
+--- setup.cfg.orig	2020-12-02 20:52:12 UTC
++++ setup.cfg
+@@ -25,10 +25,10 @@ classifier = 
+ [files]
+ packages = 
+ 	openstackdocstheme
+-scripts = 
+-	bin/docstheme-build-translated.sh
+-	bin/docstheme-lang-display-name.py
+-	bin/docstheme-build-pdf
++#scripts = 
++#	bin/docstheme-build-translated.sh
++#	bin/docstheme-lang-display-name.py
++#	bin/docstheme-build-pdf
+ 
+ [egg_info]
+ tag_build = 
diff --git a/textproc/py-os-api-ref/Makefile b/textproc/py-os-api-ref/Makefile
index 3e486b8faf68..acc27eabc449 100644
--- a/textproc/py-os-api-ref/Makefile
+++ b/textproc/py-os-api-ref/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	os-api-ref
 DISTVERSION=	1.5.0
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +17,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.10:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sphinx18>=1.6.2:textproc/py-sphinx18@${PY_FLAVOR} \
+		${PY_SPHINX} \
 		${PYTHON_PKGNAMEPREFIX}openstackdocstheme>=1.6.2:textproc/py-openstackdocstheme@${PY_FLAVOR}
 
 USES=		python:3.6+