diff --git a/textproc/hs-commonmark-extensions/DESCR b/textproc/hs-commonmark-extensions/DESCR
new file mode 100644
index 000000000000..b6a17dee4a84
--- /dev/null
+++ b/textproc/hs-commonmark-extensions/DESCR
@@ -0,0 +1,3 @@
+This library provides some useful extensions to core commonmark
+syntax: smart quotes, definition lists, tables, footnotes, math, and
+more.
diff --git a/textproc/hs-commonmark-extensions/Makefile b/textproc/hs-commonmark-extensions/Makefile
new file mode 100644
index 000000000000..41e28773467c
--- /dev/null
+++ b/textproc/hs-commonmark-extensions/Makefile
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1 2021/04/25 04:01:55 pho Exp $
+
+DISTNAME=	commonmark-extensions-0.2.0.4
+CATEGORIES=	textproc
+
+MAINTAINER=	pho@cielonegro.org
+COMMENT=	Pure Haskell commonmark parser - extensions
+LICENSE=	modified-bsd
+
+# Setup.hs is missing from the package.
+post-patch:
+	${CP} -f ${FILESDIR}/Setup.hs ${WRKSRC}/Setup.hs
+
+.include "../../textproc/hs-commonmark/buildlink3.mk"
+.include "../../converters/hs-emojis/buildlink3.mk"
+.include "../../mk/haskell.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/hs-commonmark-extensions/PLIST b/textproc/hs-commonmark-extensions/PLIST
new file mode 100644
index 000000000000..adc087e4e273
--- /dev/null
+++ b/textproc/hs-commonmark-extensions/PLIST
@@ -0,0 +1,83 @@
+@comment $NetBSD: PLIST,v 1.1 2021/04/25 04:01:55 pho Exp $
+lib/commonmark-extensions-${PKGVERSION}/${HS_VERSION}/package-description
+lib/commonmark-extensions-${PKGVERSION}/${HS_VERSION}/package-id
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Attributes.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Attributes.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Attributes.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/AutoIdentifiers.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/AutoIdentifiers.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/AutoIdentifiers.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Autolink.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Autolink.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Autolink.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/DefinitionList.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/DefinitionList.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/DefinitionList.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Emoji.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Emoji.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Emoji.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/FancyList.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/FancyList.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/FancyList.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Footnote.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Footnote.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Footnote.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/HardLineBreaks.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/HardLineBreaks.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/HardLineBreaks.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/ImplicitHeadingReferences.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/ImplicitHeadingReferences.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/ImplicitHeadingReferences.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Math.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Math.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Math.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/PipeTable.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/PipeTable.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/PipeTable.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Smart.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Smart.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Smart.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Strikethrough.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Strikethrough.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Strikethrough.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Subscript.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Subscript.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Subscript.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Superscript.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Superscript.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/Superscript.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/TaskList.dyn_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/TaskList.hi
+lib/${HS_PLATFORM}/${HS_PKGID}/Commonmark/Extensions/TaskList.p_hi
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
+lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
+lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/LICENSE
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/Commonmark-Extensions-Attributes.html
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/Commonmark-Extensions-AutoIdentifiers.html
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/Commonmark-Extensions-Autolink.html
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/Commonmark-Extensions-DefinitionList.html
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/Commonmark-Extensions-Emoji.html
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/Commonmark-Extensions-FancyList.html
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/Commonmark-Extensions-Footnote.html
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/Commonmark-Extensions-HardLineBreaks.html
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/Commonmark-Extensions-ImplicitHeadingReferences.html
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/Commonmark-Extensions-Math.html
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/Commonmark-Extensions-PipeTable.html
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/Commonmark-Extensions-Smart.html
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/Commonmark-Extensions-Strikethrough.html
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/Commonmark-Extensions-Subscript.html
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/Commonmark-Extensions-Superscript.html
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/Commonmark-Extensions-TaskList.html
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/Commonmark-Extensions.html
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/commonmark-extensions.haddock
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/doc-index.html
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/haddock-bundle.min.js
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/index.html
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/linuwial.css
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/meta.json
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/quick-jump.css
+share/doc/${HS_PLATFORM}/commonmark-extensions-${PKGVERSION}/html/synopsis.png
diff --git a/textproc/hs-commonmark-extensions/buildlink3.mk b/textproc/hs-commonmark-extensions/buildlink3.mk
new file mode 100644
index 000000000000..eb3d9cd4bffa
--- /dev/null
+++ b/textproc/hs-commonmark-extensions/buildlink3.mk
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.1 2021/04/25 04:01:55 pho Exp $
+
+BUILDLINK_TREE+=	hs-commonmark-extensions
+
+.if !defined(HS_COMMONMARK_EXTENSIONS_BUILDLINK3_MK)
+HS_COMMONMARK_EXTENSIONS_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.hs-commonmark-extensions+=	hs-commonmark-extensions>=0.2.0
+BUILDLINK_ABI_DEPENDS.hs-commonmark-extensions+=	hs-commonmark-extensions>=0.2.0.4
+BUILDLINK_PKGSRCDIR.hs-commonmark-extensions?=		../../textproc/hs-commonmark-extensions
+
+.include "../../textproc/hs-commonmark/buildlink3.mk"
+.include "../../converters/hs-emojis/buildlink3.mk"
+.endif	# HS_COMMONMARK_EXTENSIONS_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-hs-commonmark-extensions
diff --git a/textproc/hs-commonmark-extensions/distinfo b/textproc/hs-commonmark-extensions/distinfo
new file mode 100644
index 000000000000..4d12797e76f7
--- /dev/null
+++ b/textproc/hs-commonmark-extensions/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2021/04/25 04:01:55 pho Exp $
+
+SHA1 (commonmark-extensions-0.2.0.4.tar.gz) = 93d42a029a2b022d34d94a242dea28f18bf49784
+RMD160 (commonmark-extensions-0.2.0.4.tar.gz) = 10d6a087ab6ffefbdd821e0f4adb28ca596f390c
+SHA512 (commonmark-extensions-0.2.0.4.tar.gz) = 2e595dd6bfc582a783d42ae612a64917470b9fa737d9c445e83e30f7cf7500cd4d3ab5f254268cf9d7434dcd03bdaa88cd38bc4fc50d1423a2792e0d21ffe6e3
+Size (commonmark-extensions-0.2.0.4.tar.gz) = 32043 bytes
diff --git a/textproc/hs-commonmark-extensions/files/Setup.hs b/textproc/hs-commonmark-extensions/files/Setup.hs
new file mode 100644
index 000000000000..9a994af677b0
--- /dev/null
+++ b/textproc/hs-commonmark-extensions/files/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain