diff --git a/lib/Viewer.js b/lib/Viewer.js
index 70576c47..689c9c9a 100644
--- a/lib/Viewer.js
+++ b/lib/Viewer.js
@@ -21,7 +21,7 @@ function getSvgContents(diagram) {
   var outerNode = paper.node.parentNode;
 
   var svg = outerNode.innerHTML;
-  return svg.replace(/^<svg[^>]>|<\/svg>$/, '');
+  return svg.replace(/^<svg[^>]*>|<\/svg>$/g, '');
 }
 
 function initListeners(diagram, listeners) {
@@ -123,9 +123,8 @@ Viewer.prototype.saveXML = function(options, done) {
 var SVG_HEADER =
 '<?xml version="1.0" encoding="utf-8"?>\n' +
 '<!-- created with bpmn-js / http://bpmn.io -->\n' +
-'<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Basic//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-basic.dtd">\n' +
-'<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" ' +
-     'version="1.1" baseProfile="basic">\n';
+'<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\n' +
+'<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">\n';
 
 var SVG_FOOTER = '</svg>';
 
diff --git a/test/spec/browser/ViewerSpec.js b/test/spec/browser/ViewerSpec.js
index e1d26721..d1a1a6bf 100644
--- a/test/spec/browser/ViewerSpec.js
+++ b/test/spec/browser/ViewerSpec.js
@@ -107,6 +107,9 @@ describe('Viewer', function() {
           // ensure correct rendering of SVG contents
           expect(svg.indexOf('undefined')).toBe(-1);
 
+          // expect header to be written only once
+          expect(svg.indexOf('<svg width="100%" height="100%">')).toBe(-1);
+
           done();
         });
       });