diff --git a/textproc/py-markdown/Makefile b/textproc/py-markdown/Makefile
index 110d4958dd6a..571878197948 100644
--- a/textproc/py-markdown/Makefile
+++ b/textproc/py-markdown/Makefile
@@ -1,31 +1,33 @@
 # Created by: Graham Todd <gtodd@bellanet.org>
 
 PORTNAME=	markdown
-PORTVERSION=	3.3.4
+PORTVERSION=	3.3.6
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Markdown-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python implementation of Markdown
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>0:devel/py-importlib-metadata@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytidylib>0:textproc/py-pytidylib@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
 
 USES=		python:3.6+
-USE_PYTHON=	distutils concurrent autoplist
+USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 31000
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.4:devel/py-importlib-metadata@${PY_FLAVOR}
+.endif
+
 do-test:
-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
+	cd ${WRKSRC} && ${PYTHON_CMD} -m unittest -v
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/textproc/py-markdown/distinfo b/textproc/py-markdown/distinfo
index 149882e34f05..74bd55272cee 100644
--- a/textproc/py-markdown/distinfo
+++ b/textproc/py-markdown/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618638255
-SHA256 (Markdown-3.3.4.tar.gz) = 31b5b491868dcc87d6c24b7e3d19a0d730d59d3e46f4eea6430a321bed387a49
-SIZE (Markdown-3.3.4.tar.gz) = 322192
+TIMESTAMP = 1647264682
+SHA256 (Markdown-3.3.6.tar.gz) = 76df8ae32294ec39dcf89340382882dfa12975f87f45c3ed1ecdb1e8cefc7006
+SIZE (Markdown-3.3.6.tar.gz) = 323584
diff --git a/textproc/py-markdown/files/patch-setup.py b/textproc/py-markdown/files/patch-setup.py
deleted file mode 100644
index 49128bf88917..000000000000
--- a/textproc/py-markdown/files/patch-setup.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- setup.py.orig	2021-02-24 19:57:42 UTC
-+++ setup.py
-@@ -129,5 +129,6 @@ setup(
-         'Topic :: Text Processing :: Filters',
-         'Topic :: Text Processing :: Markup :: HTML',
-         'Topic :: Text Processing :: Markup :: Markdown'
--    ]
-+    ],
-+    test_suite='nose.collector',
- )
diff --git a/textproc/py-markdown/pkg-descr b/textproc/py-markdown/pkg-descr
index 51d400b926cc..2bb518478841 100644
--- a/textproc/py-markdown/pkg-descr
+++ b/textproc/py-markdown/pkg-descr
@@ -1,13 +1,18 @@
-This is a Python implementation of John Gruber's Markdown. It is almost
-completely compliant with the reference implementation, though there are a
-few very minor differences.
+Python-Markdown is a Python implementation of John Gruber's Markdown. It is
+almost completely compliant with the reference implementation, though there are
+a few known issues.
 
-Features:
+In addition to the basic markdown syntax, Python-Markdown supports the following
+features:
+- International Input: Python-Markdown will accept input in any language
+  supported by Unicode including bi-directional text. In fact the test suite
+  includes documents written in Russian and Arabic.
+- Extensions: Various extensions are provided (including extra) to change and/or
+  extend the base syntax. Additionally, a public Extension API is available to
+  write your own extensions.
+- Output Formats: Python-Markdown can output documents with either HTML or XHTML
+  style tags. See the Library Reference for details.
+- Command Line Interface: In addition to being a Python Library, a command line
+  script is available for your convenience.
 
-  * International Input
-  * Extensions
-  * Output Formats
-  * "Safe Modes"
-  * Command Line Interface
-
-WWW: https://pythonhosted.org/Markdown/
+WWW: https://github.com/Python-Markdown/markdown