diff --git a/package.json b/package.json
index 8e2e640..b80f208 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "babel-register": "^6.23.0",
     "chai": "^3.5.0",
     "eslint": "^3.16.1",
-    "microbundle": "^0.4.4",
+    "microbundle": "^0.12.0",
     "mocha": "^5.1.1"
   },
   "eslintConfig": {
diff --git a/src/index.js b/src/index.js
index 8e40bf8..9ddd0d4 100644
--- a/src/index.js
+++ b/src/index.js
@@ -59,7 +59,7 @@ export default function parse(md, prevLinks) {
 		}
 		// Code/Indent blocks:
 		else if (token[3] || token[4]) {
-			chunk = '<pre class="code '+(token[4]?'poetry':token[2].toLowerCase())+'">'+outdent(encodeAttr(token[3] || token[4]).replace(/^\n+|\n+$/g, ''))+'</pre>';
+			chunk = '<pre class="code '+(token[4]?'poetry':token[2].toLowerCase())+'"><code'+(token[2] ? ` class="language-${token[2].toLowerCase()}"` : '')+'>'+outdent(encodeAttr(token[3] || token[4]).replace(/^\n+|\n+$/g, ''))+'</code></pre>';
 		}
 		// > Quotes, -* lists:
 		else if (token[6]) {
diff --git a/test/index.js b/test/index.js
index 8e8aaac..1b5ab99 100644
--- a/test/index.js
+++ b/test/index.js
@@ -114,18 +114,18 @@ describe('snarkdown()', () => {
 		});
 
 		it('parses three backtricks (```) as a code block', () => {
-			expect(snarkdown('```\nfunction codeBlocks() {\n\treturn "Can be inserted";\n}\n```')).to.equal('<pre class="code ">function codeBlocks() {\n\treturn &quot;Can be inserted&quot;;\n}</pre>');
+			expect(snarkdown('```\nfunction codeBlocks() {\n\treturn "Can be inserted";\n}\n```')).to.equal('<pre class="code "><code>function codeBlocks() {\n\treturn &quot;Can be inserted&quot;;\n}</code></pre>');
 
-			expect(snarkdown('```js\nfunction codeBlocks() {\n\treturn "Can be inserted";\n}\n```')).to.equal('<pre class="code js">function codeBlocks() {\n\treturn &quot;Can be inserted&quot;;\n}</pre>');
+			expect(snarkdown('```js\nfunction codeBlocks() {\n\treturn "Can be inserted";\n}\n```')).to.equal('<pre class="code js"><code class="language-js">function codeBlocks() {\n\treturn &quot;Can be inserted&quot;;\n}</code></pre>');
 		});
 
 		it('parses tabs as a code poetry block', () => {
-			expect(snarkdown('\tvar a = 1')).to.equal('<pre class="code poetry">var a = 1</pre>');
+			expect(snarkdown('\tvar a = 1')).to.equal('<pre class="code poetry"><code>var a = 1</code></pre>');
 		});
 
 		it('escapes code/quote blocks', () => {
-			expect(snarkdown('```\n<foo>\n```')).to.equal('<pre class="code ">&lt;foo&gt;</pre>');
-			expect(snarkdown('\t<foo>')).to.equal('<pre class="code poetry">&lt;foo&gt;</pre>');
+			expect(snarkdown('```\n<foo>\n```')).to.equal('<pre class="code "><code>&lt;foo&gt;</code></pre>');
+			expect(snarkdown('\t<foo>')).to.equal('<pre class="code poetry"><code>&lt;foo&gt;</code></pre>');
 		});
 
 		it('parses a block quote', () => {