diff --git a/src/main/org/apache/tools/ant/XmlLogger.java b/src/main/org/apache/tools/ant/XmlLogger.java
index 96b9ea244..d9fb3f214 100644
--- a/src/main/org/apache/tools/ant/XmlLogger.java
+++ b/src/main/org/apache/tools/ant/XmlLogger.java
@@ -132,8 +132,12 @@ public class XmlLogger implements BuildListener {
             if (outFilename == null) {
                 outFilename = "log.xml";
             }
-
-            Writer out = new FileWriter(outFilename);
+            
+            // specify output in UTF8 otherwise accented characters will blow
+            // up everything
+            Writer out =
+                new OutputStreamWriter(new FileOutputStream(outFilename),
+                                       "UTF8");
             out.write("<?xml:stylesheet type=\"text/xsl\" href=\"log.xsl\"?>\n\n");
             (new DOMElementWriter()).write(buildElement, out, 0, "\t");
             out.flush();
diff --git a/src/main/org/apache/tools/ant/util/DOMElementWriter.java b/src/main/org/apache/tools/ant/util/DOMElementWriter.java
index cc44790ab..2b520e8c8 100644
--- a/src/main/org/apache/tools/ant/util/DOMElementWriter.java
+++ b/src/main/org/apache/tools/ant/util/DOMElementWriter.java
@@ -67,7 +67,7 @@ import org.w3c.dom.*;
  *
  * @author The original author of XmlLogger
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
- * @author <a href="mailto:bailliez@noos.fr">Stephane Bailliez</tt>
+ * @author <a href="mailto:sbailliez@imediation.com">Stephane Bailliez</tt>
  */
 public class DOMElementWriter {
 
@@ -131,6 +131,9 @@ public class DOMElementWriter {
                 break;
                 
             case Node.TEXT_NODE:
+                out.write(encode(child.getNodeValue()));
+                break;
+                
             case Node.CDATA_SECTION_NODE:
                 out.write("<![CDATA[");
                 out.write(((Text)child).getData());
@@ -170,10 +173,11 @@ public class DOMElementWriter {
         out.write(element.getTagName());
         out.write(">");
         out.write(lSep);
+        out.flush();
     }
 
     /**
-     * Escape &lt;, &amp; and &quot; as their entities.
+     * Escape &lt;, &gt; &amp; &apos; and &quot; as their entities.
      */
     public String encode(String value) {
         sb.setLength(0);
@@ -183,6 +187,12 @@ public class DOMElementWriter {
             case '<':
                 sb.append("&lt;");
                 break;
+            case '>':
+                sb.append("&gt;");
+                break;
+            case '\'':
+                sb.append("&apos;");
+                break;
             case '\"':
                 sb.append("&quot;");
                 break;