diff --git a/core/lib/patternlab.js b/core/lib/patternlab.js
index cafd77b71..168029fe4 100644
--- a/core/lib/patternlab.js
+++ b/core/lib/patternlab.js
@@ -14,7 +14,8 @@ var diveSync = require('diveSync'),
   glob = require('glob'),
   _ = require('lodash'),
   path = require('path'),
-  plutils = require('./utilities');
+  plutils = require('./utilities'),
+  cleanHtml = require('js-beautify').html;
 
 function buildPatternData(dataFilesPath, fs) {
   var dataFiles = glob.sync(dataFilesPath + '*.json', {"ignore" : [dataFilesPath + 'listitems.json']});
@@ -386,13 +387,16 @@ var patternlab_engine = function (config) {
 
       //write the compiled template to the public patterns directory
       var patternPage = headHTML + pattern.patternPartialCode + footerHTML;
-      fs.outputFileSync(paths.public.patterns + pattern.getPatternLink(patternlab, 'rendered'), patternPage);
+      var cleanedPatternPage = config.cleanOutputHtml ? cleanHtml(patternPage) : patternPage;
+      var cleanedPatternPartialCode = config.cleanOutputHtml ? cleanHtml(pattern.patternPartialCode) : pattern.patternPartialCode;
+
+      fs.outputFileSync(paths.public.patterns + pattern.getPatternLink(patternlab, 'rendered'), cleanedPatternPage);
 
       //write the mustache file too
       fs.outputFileSync(paths.public.patterns + pattern.getPatternLink(patternlab, 'rawTemplate'), pattern.template);
 
       //write the encoded version too
-      fs.outputFileSync(paths.public.patterns + pattern.getPatternLink(patternlab, 'markupOnly'), pattern.patternPartialCode);
+      fs.outputFileSync(paths.public.patterns + pattern.getPatternLink(patternlab, 'markupOnly'), cleanedPatternPartialCode);
 
       return true;
     });
diff --git a/package.json b/package.json
index 6027e9d53..c37bfd5eb 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
     "diveSync": "^0.3.0",
     "fs-extra": "^0.30.0",
     "glob": "^7.0.0",
+    "js-beautify": "^1.6.3",
     "js-yaml": "^3.6.1",
     "json5": "^0.5.0",
     "lodash": "~4.13.1",
diff --git a/patternlab-config.json b/patternlab-config.json
index 5292c76bd..ffc197121 100644
--- a/patternlab-config.json
+++ b/patternlab-config.json
@@ -59,5 +59,6 @@
     "rendered": ".rendered",
     "rawTemplate": "",
     "markupOnly": ".markup-only"
-  }
+  },
+  "cleanOutputHtml": true
 }