Index: page-mapping.xml
===================================================================
--- page-mapping.xml	(revision 190581)
+++ page-mapping.xml	(working copy)
@@ -48,7 +48,7 @@
       <bind-xml name="name" node="attribute"/>
     </field>
 
-    <field name="locale" type="java.lang.String" set-method="setLanguage">
+	<field name="language" type="java.lang.String">
       <bind-xml name="xml:lang" node="attribute"/>
     </field>
 
Index: CastorFileSystemDocumentHandler.java
===================================================================
--- CastorFileSystemDocumentHandler.java	(revision 190581)
+++ CastorFileSystemDocumentHandler.java	(working copy)
@@ -17,9 +17,11 @@
 
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -167,11 +169,11 @@
             fileName = path + this.documentType;
         }
         File f = new File(this.documentRootDir, fileName);
-        FileWriter writer = null;
+        Writer writer = null;
 
         try
         {
-            writer = new FileWriter(f);
+            writer = new OutputStreamWriter(new FileOutputStream(f), "UTF-8");
             Serializer serializer = new XMLSerializer(writer, this.format);
             Marshaller marshaller = new Marshaller(serializer.asDocumentHandler());
             marshaller.setMapping(this.mapping);