diff --git a/baksmali/src/main/java/org/jf/baksmali/baksmali.java b/baksmali/src/main/java/org/jf/baksmali/baksmali.java
index 451abb8b..ed0fc307 100644
--- a/baksmali/src/main/java/org/jf/baksmali/baksmali.java
+++ b/baksmali/src/main/java/org/jf/baksmali/baksmali.java
@@ -169,7 +169,8 @@ public class baksmali {
                     }
                 }
 
-                BufferedWriter bufWriter = new BufferedWriter(new FileWriter(smaliFile));
+                BufferedWriter bufWriter = new BufferedWriter(new OutputStreamWriter(
+                        new FileOutputStream(smaliFile), "UTF8"));
 
                 writer = new IndentingWriter(bufWriter);
                 classDefinition.writeTo((IndentingWriter)writer);
diff --git a/smali/src/main/java/org/jf/smali/main.java b/smali/src/main/java/org/jf/smali/main.java
index ce03083c..2a35d95b 100644
--- a/smali/src/main/java/org/jf/smali/main.java
+++ b/smali/src/main/java/org/jf/smali/main.java
@@ -246,7 +246,7 @@ public class main {
 
     private static boolean assembleSmaliFile(File smaliFile, DexFile dexFile)
             throws Exception {
-        ANTLRInputStream input = new ANTLRInputStream(new FileInputStream(smaliFile));
+        ANTLRInputStream input = new ANTLRInputStream(new FileInputStream(smaliFile), "UTF8");
         input.name = smaliFile.getAbsolutePath();
 
         smaliLexer lexer = new smaliLexer(input);