diff --git a/jps/jps-builders-6/src/org/jetbrains/jps/javac/OutputFileObject.java b/jps/jps-builders-6/src/org/jetbrains/jps/javac/OutputFileObject.java
index 2c3b103b1cd6..0a93a947f9ad 100644
--- a/jps/jps-builders-6/src/org/jetbrains/jps/javac/OutputFileObject.java
+++ b/jps/jps-builders-6/src/org/jetbrains/jps/javac/OutputFileObject.java
@@ -143,6 +143,12 @@ public final class OutputFileObject extends SimpleJavaFileObject {
     return FileUtilRt.loadFile(myFile, encoding, false);
   }
 
+  @Override
+  public Writer openWriter() throws IOException {
+    final String encoding = myEncodingName;
+    return encoding != null? new OutputStreamWriter(openOutputStream(), encoding) : super.openWriter();
+  }
+
   @Nullable
   public BinaryContent getContent() {
     return myContent;