diff --git a/MOVED b/MOVED
index 7ff7ead2e6ae..e75bb6285ddb 100644
--- a/MOVED
+++ b/MOVED
@@ -16617,3 +16617,4 @@ games/xnethack-nox11|games/xnethack@nox11|2021-12-05|Turned into flavor
 devel/py-dexml||2021-12-20|Has expired: Use devel/py-dexml2
 misc/cmatrix|games/cmatrix|2021-12-20|Move to a more appropriate category
 games/homura|games/suyimazu|2021-12-21|Project renamed
+textproc/py-markdown-math|textproc/py-python-markdown-math|2021-12-21|Rename to match upstream naming
diff --git a/textproc/Makefile b/textproc/Makefile
index 4f49552e9f1f..b403ad033225 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1347,7 +1347,6 @@
     SUBDIR += py-mako
     SUBDIR += py-markdown
     SUBDIR += py-markdown-it-py
-    SUBDIR += py-markdown-math
     SUBDIR += py-markdown2
     SUBDIR += py-marko
     SUBDIR += py-markuppy
@@ -1425,6 +1424,7 @@
     SUBDIR += py-python-gettext
     SUBDIR += py-python-lsp-jsonrpc
     SUBDIR += py-python-lsp-server
+    SUBDIR += py-python-markdown-math
     SUBDIR += py-python-slugify
     SUBDIR += py-python-xmp-toolkit
     SUBDIR += py-pytidylib
diff --git a/textproc/py-markdown-math/Makefile b/textproc/py-markdown-math/Makefile
deleted file mode 100644
index 4398da67eceb..000000000000
--- a/textproc/py-markdown-math/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-PORTNAME=	markdown-math
-PORTVERSION=	0.8
-CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	python-${PORTNAME}-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Math formulas support to Python-Markdown
-
-LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:textproc/py-markdown@${PY_FLAVOR}
-
-USES=	python:3.2+
-USE_PYTHON=	distutils autoplist
-
-.include <bsd.port.mk>
diff --git a/textproc/py-python-markdown-math/Makefile b/textproc/py-python-markdown-math/Makefile
new file mode 100644
index 000000000000..d67cbe7c8e9a
--- /dev/null
+++ b/textproc/py-python-markdown-math/Makefile
@@ -0,0 +1,20 @@
+PORTNAME=	python-markdown-math
+PORTVERSION=	0.8
+CATEGORIES=	textproc python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Math extension for Python-Markdown
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}markdown>=3.0:textproc/py-markdown@${PY_FLAVOR}
+
+USES=		python:3.6+
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/textproc/py-markdown-math/distinfo b/textproc/py-python-markdown-math/distinfo
similarity index 100%
rename from textproc/py-markdown-math/distinfo
rename to textproc/py-python-markdown-math/distinfo
diff --git a/textproc/py-markdown-math/pkg-descr b/textproc/py-python-markdown-math/pkg-descr
similarity index 100%
rename from textproc/py-markdown-math/pkg-descr
rename to textproc/py-python-markdown-math/pkg-descr
diff --git a/textproc/retext/Makefile b/textproc/retext/Makefile
index 0dd4740e441d..97f76c8fe39b 100644
--- a/textproc/retext/Makefile
+++ b/textproc/retext/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	retext
 DISTVERSION=	7.2.2
+PORTREVISION=	1
 CATEGORIES=	textproc
 
 MAINTAINER=	ports@FreeBSD.org
@@ -10,7 +11,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE_GPL
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}markdown>=2.0.3:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Markups>=3.0.0:textproc/py-markups@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}markdown-math>=0.6:textproc/py-markdown-math@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-markdown-math>=0.6:textproc/py-python-markdown-math@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>=0:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}enchant>=0:textproc/py-enchant@${PY_FLAVOR}