diff --git a/sat/plugins/plugin_misc_text_syntaxes.py b/sat/plugins/plugin_misc_text_syntaxes.py
index 8007c339..402c30ab 100755
--- a/sat/plugins/plugin_misc_text_syntaxes.py
+++ b/sat/plugins/plugin_misc_text_syntaxes.py
@@ -215,7 +215,20 @@ class TextSyntaxes(object):
 
             self.addSyntax(
                 self.SYNTAX_MARKDOWN,
-                partial(markdown.markdown, extensions=[EscapeHTML()]),
+                partial(markdown.markdown,
+                        extensions=[
+                            EscapeHTML(),
+                            u'nl2br',
+                            u'codehilite',
+                            u'fenced_code',
+                            u'sane_lists',
+                            u'tables',
+                            ],
+                        extension_configs = {
+                            u"codehilite": {
+                                u"css_class": "highlight",
+                            }
+                        }),
                 _html2text,
                 [TextSyntaxes.OPT_DEFAULT],
             )