2 files changed, 7 insertions, 6 deletions
diff --git a/js/stmd.js b/js/stmd.js
index 78ea89b..6895008 100755
--- a/js/stmd.js
+++ b/js/stmd.js
@@ -1478,9 +1478,10 @@ var renderBlock = function(block, in_tight_list) {
     case 'FencedCode':
       info_words = block.info.split(/ +/);
       attr = info_words.length === 0 || info_words[0].length === 0 ?
-                   [] : [['class',this.escape(info_words[0],true)]];
-      return inTags('pre', attr,
-              inTags('code', [], this.escape(block.string_content)));
+                   [] : [['class','language-' +
+                                   this.escape(info_words[0],true)]];
+      return inTags('pre', [],
+              inTags('code', attr, this.escape(block.string_content)));
     case 'HtmlBlock':
       return block.string_content;
     case 'ReferenceDef':
diff --git a/src/html.c b/src/html.c
index 56d5dbb..aeec5f1 100644
--- a/src/html.c
+++ b/src/html.c
@@ -156,15 +156,15 @@ extern int blocks_to_html(block* b, bstring* result, bool tight)
     case fenced_code:
       escaped = escape_html(b->string_content, false);
       cr(html);
-      bformata(html, "<pre");
+      bformata(html, "<pre><code");
       if (blength(b->attributes.fenced_code_data.info) > 0) {
         escaped2 = escape_html(b->attributes.fenced_code_data.info, true);
         info_words = bsplit(escaped2, ' ');
-        bformata(html, " class=\"%s\"", info_words->entry[0]->data);
+        bformata(html, " class=\"language-%s\"", info_words->entry[0]->data);
         bdestroy(escaped2);
         bstrListDestroy(info_words);
       }
-      bformata(html, "><code>%s</code></pre>", escaped->data);
+      bformata(html, ">%s</code></pre>", escaped->data);
       cr(html);
       bdestroy(escaped);
       break;