diff --git a/deskutils/mindforger/Makefile b/deskutils/mindforger/Makefile
index fc84ee3fc04b..cd0e1d333d93 100644
--- a/deskutils/mindforger/Makefile
+++ b/deskutils/mindforger/Makefile
@@ -1,30 +1,45 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 
 PORTNAME=	mindforger
 PORTVERSION=	1.52.0
 CATEGORIES=	deskutils
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Thinking notebook and markdown editor
 
 LICENSE=	GPLv2+
 
 USES=		qmake qt:5
-USE_GITHUB=	yes
-GH_ACCOUNT=	dvorka
 USE_QT=		buildtools_build core declarative gui location network \
 		printsupport webchannel webengine widgets
+USE_GITHUB=	yes
+GH_ACCOUNT=	dvorka
+GH_PROJECT=	cmark:cm
+GH_TAGNAME=	f06d944:cm
+GH_SUBDIR=	deps/cmark-gfm:cm
+
+QMAKE_ARGS=	CONFIG+="mfnocxx mfwebengine"
+
+OPTIONS_DEFINE=	CMARK
+OPTIONS_DEFAULT=	CMARK
+CMARK_DESC=	CommonMark support (Markdown -> HTML rendering)
+
+CMARK_BUILD_DEPENDS=	cmake:devel/cmake
+CMARK_QMAKE_OFF=	CONFIG+="mfnomd2html"
 
-QMAKE_ARGS=	CONFIG+="mfwebengine mfnocxx mfnomd2html"
+pre-build-CMARK-on:
+	@cd ${WRKSRC_cm} && cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+		-DCMARK_TESTS:BOOL=OFF -DCMARK_SHARED:BOOL=OFF \
+		-B build && cmake --build build
 
 post-patch:
 	@${REINPLACE_CMD} -e '/_WIN32/s,_APPLE,_${OPSYS},' \
 		${WRKSRC}/app/src/qt/note_view_presenter.cpp \
 		${WRKSRC}/app/src/qt/note_view_presenter.h \
 		${WRKSRC}/app/src/qt/outline_header_view_presenter.cpp
 	@${REINPLACE_CMD} -e '/#include <sys\/dir\.h>/d' \
 		${WRKSRC}/lib/src/config/config.h
 	@${REINPLACE_CMD} -e '/path = /s,/usr,$$$$PREFIX,' \
 		${WRKSRC}/app/app.pro ${WRKSRC}/mindforger.pro
 
 .include <bsd.port.mk>
diff --git a/deskutils/mindforger/distinfo b/deskutils/mindforger/distinfo
index 9d5feabe5669..34ac782baf2b 100644
--- a/deskutils/mindforger/distinfo
+++ b/deskutils/mindforger/distinfo
@@ -1,3 +1,5 @@
 TIMESTAMP = 1583687032
 SHA256 (dvorka-mindforger-1.52.0_GH0.tar.gz) = d0fc9469e932a27f93b13acb6b708e2cfac37858083e0572a4c39b01b8202773
 SIZE (dvorka-mindforger-1.52.0_GH0.tar.gz) = 1775600
+SHA256 (dvorka-cmark-f06d944_GH0.tar.gz) = 7793cd6f1904a7674f9830985ded7c096e8edfdfd2f21c7127213ffffa56fe6d
+SIZE (dvorka-cmark-f06d944_GH0.tar.gz) = 279633