diff --git a/lib/xml.js b/lib/xml.js
index 01a5654..a5a2ea3 100644
--- a/lib/xml.js
+++ b/lib/xml.js
@@ -66,9 +66,8 @@ function xml(input, options) {
         if (declaration.standalone) {
             attr.standalone = declaration.standalone
         }
-
+ 
         add({'?xml': { _attr: attr } });
-        output = output.replace('/>', '?>');
     }
 
     // disable delay delayed
@@ -240,7 +239,7 @@ function format(append, elem, end) {
         }
 
         append(false, (len > 1 ? elem.indents : '')
-            + (elem.name ? '</' + elem.name + '>' : '')
+            + (elem.name ? '<' + '/' + elem.name + '>' : '')
             + (elem.indent && !end ? '\n' : ''));
 
         if (end) {
@@ -262,7 +261,7 @@ function format(append, elem, end) {
     append(false, elem.indents
         + (elem.name ? '<' + elem.name : '')
         + (elem.attributes.length ? ' ' + elem.attributes.join(' ') : '')
-        + (len ? (elem.name ? '>' : '') : (elem.name ? '/>' : ''))
+        + (len ? (elem.name ? '>' : '') : (elem.name ? (/^\?/.test(elem.name)? '?' : '/') + '>' : ''))
         + (elem.indent && len > 1 ? '\n' : ''));
 
     if (!len) {