diff --git a/src/flextype/core/Parsers/Shortcodes/MarkdownShortcode.php b/src/flextype/core/Parsers/Shortcodes/MarkdownShortcode.php
new file mode 100644
index 00000000..801eb1ad
--- /dev/null
+++ b/src/flextype/core/Parsers/Shortcodes/MarkdownShortcode.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+ /**
+ * Flextype - Hybrid Content Management System with the freedom of a headless CMS 
+ * and with the full functionality of a traditional CMS!
+ * 
+ * Copyright (c) Sergey Romanenko (https://awilum.github.io)
+ *
+ * Licensed under The MIT License.
+ *
+ * For full copyright and license information, please see the LICENSE
+ * Redistributions of files must retain the above copyright notice.
+ */
+
+namespace Flextype\Parsers\Shortcodes;
+
+use Thunder\Shortcode\Shortcode\ShortcodeInterface;
+use function parsers;
+
+// Shortcode: [markdown] markdown text here [/markdown]
+parsers()->shortcodes()->addHandler('markdown', static function (ShortcodeInterface $s) {
+    return parsers()->markdown()->parse($s->getContent());
+});
\ No newline at end of file
diff --git a/src/flextype/settings.yaml b/src/flextype/settings.yaml
index e947f3f8..f6e8bcf3 100644
--- a/src/flextype/settings.yaml
+++ b/src/flextype/settings.yaml
@@ -522,6 +522,9 @@ parsers:
       raw:
         enabled: true
         path: "/src/flextype/core/Parsers/Shortcodes/RawShortcode.php"
+      markdown:
+        enabled: true
+        path: "/src/flextype/core/Parsers/Shortcodes/MarkdownShortcode.php"
       registry:
         enabled: true
         path: "/src/flextype/core/Parsers/Shortcodes/RegistryShortcode.php"