diff --git a/lib/parse/page.js b/lib/parse/page.js
index b28135c67..09670b809 100644
--- a/lib/parse/page.js
+++ b/lib/parse/page.js
@@ -1,12 +1,17 @@
 var _ = require('lodash');
 var marked = require('marked');
+var hljs = require('highlight.js');
 
 var renderer = require('./renderer');
 
 // Synchronous highlighting with highlight.js
 marked.setOptions({
-    highlight: function (code) {
-        return require('highlight.js').highlightAuto(code).value;
+    highlight: function (code, lang) {
+        try {
+            return hljs.highlight(lang, code).value;
+        } catch(e) {
+            return hljs.highlightAuto(code).value;
+        }
     }
 });