diff --git a/android2po/commands.py b/android2po/commands.py
index 8f79458..65e9eb8 100644
--- a/android2po/commands.py
+++ b/android2po/commands.py
@@ -50,8 +50,10 @@ def xml2string(tree, action):
     """
     ENCODING = 'utf-8'
     dom = convert.write_xml(tree, warnfunc=action.message)
-    return etree.tostring(dom, xml_declaration=True,
-                          encoding=ENCODING, pretty_print=True).decode('utf-8')
+    etree.indent(dom, space="    ")
+    return etree.tostring(dom, xml_declaration=False,
+                          doctype='<?xml version="1.0" encoding="' + ENCODING + '"?>',
+                          encoding=ENCODING, pretty_print=True).decode(ENCODING)
 
 
 def read_xml(action, filename, **kw):
@@ -429,7 +431,7 @@ def execute(self):
             # This will make us pick up the language on subsequent runs.
             for kind in self.env.xmlfiles:
                 if write_file(self, language.xml(kind),
-                              """<?xml version='1.0' encoding='utf-8'?>\n<resources>\n</resources>""",
+                              """<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<resources>\n</resources>""",
                               update=False, ignore_exists=show_exists):
                     something_done = True