diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html
index 21a0b8797e..e3e3dab395 100644
--- a/docs/_includes/customizer-variables.html
+++ b/docs/_includes/customizer-variables.html
@@ -295,7 +295,7 @@
   </div>
 </div>
 <h2 id="buttons">Buttons</h2>
-<p>For each of Bootstrap&#39;s buttons, define text, background and border color.</p>
+<p>For each of Bootstrap's buttons, define text, background and border color.</p>
 <div class="row">
   <div class="bs-customizer-input">
     <label for="input-@btn-font-weight">@btn-font-weight</label>
diff --git a/grunt/bs-lessdoc-parser.js b/grunt/bs-lessdoc-parser.js
index c1821de1cb..fb1666187c 100644
--- a/grunt/bs-lessdoc-parser.js
+++ b/grunt/bs-lessdoc-parser.js
@@ -6,11 +6,13 @@
  */
 'use strict';
 
-var markdown = require('markdown').markdown;
+var Remarkable = require('remarkable');
 
 function markdown2html(markdownString) {
+  var md = new Remarkable();
+
   // the slice removes the <p>...</p> wrapper output by Markdown processor
-  return markdown.toHTML(markdownString.trim()).slice(3, -4);
+  return md.render(markdownString.trim()).slice(3, -5);
 }
 
 
diff --git a/package.json b/package.json
index 624625ce26..f52ca15f80 100644
--- a/package.json
+++ b/package.json
@@ -56,8 +56,8 @@
     "grunt-saucelabs": "~8.3.2",
     "grunt-sed": "~0.1.1",
     "load-grunt-tasks": "~1.0.0",
-    "markdown": "~0.5.0",
     "npm-shrinkwrap": "~4.0.0",
+    "remarkable": "^1.2.0",
     "time-grunt": "~1.0.0"
   },
   "engines": {