diff --git a/lib/jsdoc/util/markdown.js b/lib/jsdoc/util/markdown.js
index 1c86bc00..2708bbd8 100644
--- a/lib/jsdoc/util/markdown.js
+++ b/lib/jsdoc/util/markdown.js
@@ -97,6 +97,10 @@ function getParseFunction(parserName, conf) {
     conf = conf || {};
 
     if (parserName === parserNames.marked) {
+        if (conf.hardwrap) {
+            marked.setOptions({breaks: true});
+        }
+
         // Marked generates an "id" attribute for headers; this custom renderer suppresses it
         markedRenderer = new marked.Renderer();
 
diff --git a/test/specs/jsdoc/util/markdown.js b/test/specs/jsdoc/util/markdown.js
index e850c9ed..2ad22cbf 100644
--- a/test/specs/jsdoc/util/markdown.js
+++ b/test/specs/jsdoc/util/markdown.js
@@ -97,5 +97,13 @@ describe('jsdoc/util/markdown', function() {
 
             expect(parser(markdownText)).toBe(convertedText);
         });
+        
+        it('should hardwrap new lines when hardwrap is enabled', function() {
+            var storage = setMarkdownConf({hardwrap: true});
+            var parser = markdown.getParser();
+
+            expect(parser('line one\nline two')).toEqual(
+                '<p>line one<br>line two</p>');
+        });
     });
 });