diff --git a/textproc/py-markdown2/Makefile b/textproc/py-markdown2/Makefile
index e22c892650b5..99199b7f9ee0 100644
--- a/textproc/py-markdown2/Makefile
+++ b/textproc/py-markdown2/Makefile
@@ -1,18 +1,35 @@
 PORTNAME=	markdown2
-PORTVERSION=	2.3.6
+PORTVERSION=	2.4.10
 CATEGORIES=	textproc python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Fast and complete Python implementation of Markdown
-WWW=		https://code.google.com/p/python-markdown2/
+WWW=		https://github.com/trentm/python-markdown2
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USES=		python zip
-USE_PYTHON=	autoplist distutils
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+TEST_ENV=	PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 NO_ARCH=	yes
 
+OPTIONS_DEFINE=		SYNTAX WAVEDROM
+OPTIONS_DEFAULT=	SYNTAX WAVEDROM
+
+SYNTAX_DESC=		Code syntax highlighting support
+WAVEDROM_DESC=		WaveDrom support
+
+SYNTAX_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>=2.7.3:textproc/py-pygments@${PY_FLAVOR}
+WAVEDROM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wavedrom>0:textproc/py-wavedrom@${PY_FLAVOR}
+
+# One test (= markdown2/tm/issue52_hang) always results in an error which
+# is a known failure.
+do-test:
+	cd ${WRKSRC}/test && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} test.py
+
 .include <bsd.port.mk>
diff --git a/textproc/py-markdown2/distinfo b/textproc/py-markdown2/distinfo
index a26cf43380b7..69426697a5b6 100644
--- a/textproc/py-markdown2/distinfo
+++ b/textproc/py-markdown2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538136347
-SHA256 (markdown2-2.3.6.zip) = 08a124043aa0ad36ba2136239547d5011a2b770278abb11a5609611e0040ea05
-SIZE (markdown2-2.3.6.zip) = 166114
+TIMESTAMP = 1693485468
+SHA256 (markdown2-2.4.10.tar.gz) = cdba126d90dc3aef6f4070ac342f974d63f415678959329cc7909f96cc235d72
+SIZE (markdown2-2.4.10.tar.gz) = 123813