diff --git a/lib/jsdoc/util/markdown.js b/lib/jsdoc/util/markdown.js
index 2708bbd8..ac6d7e9a 100644
--- a/lib/jsdoc/util/markdown.js
+++ b/lib/jsdoc/util/markdown.js
@@ -104,9 +104,11 @@ function getParseFunction(parserName, conf) {
         // Marked generates an "id" attribute for headers; this custom renderer suppresses it
         markedRenderer = new marked.Renderer();
 
-        markedRenderer.heading = function(text, level) {
-            return util.format('<h%s>%s</h%s>', level, text, level);
-        };
+        if(!conf.idInHeadings) {
+            markedRenderer.heading = function(text, level) {
+                return util.format('<h%s>%s</h%s>', level, text, level);
+            };
+        }
 
         // Allow prettyprint to work on inline code samples
         markedRenderer.code = function(code, language) {