diff --git a/CHANGES.txt b/CHANGES.txt
index 33c24ada6d..6ffddc0a0a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -18,6 +18,7 @@
  * Exceptions encountered calling getSeeds() breaks OTC thread (CASSANDRA-13018)
  * Commitlog replay may fail if last mutation is within 4 bytes of end of segment (CASSANDRA-13282)
 Merged from 2.1:
+ * Set javac encoding to utf-8 (CASSANDRA-13466)
  * Fix 2ndary index queries on partition keys for tables with static columns (CASSANDRA-13147)
  * Fix ParseError unhashable type list in cqlsh copy from (CASSANDRA-13364)
  * Remove unused repositories (CASSANDRA-13278)
diff --git a/build.xml b/build.xml
index 867afa496c..dc5aecb430 100644
--- a/build.xml
+++ b/build.xml
@@ -812,6 +812,7 @@
         <!-- Order matters! -->
         <javac fork="true"
                debug="true" debuglevel="${debuglevel}"
+               encoding="utf-8"
                destdir="${build.classes.thrift}" includeantruntime="false" source="${source.version}" target="${target.version}"
                memorymaximumsize="512M">
             <src path="${interface.thrift.dir}/gen-java"/>
@@ -819,6 +820,7 @@
         </javac>
         <javac fork="true"
                debug="true" debuglevel="${debuglevel}"
+               encoding="utf-8"
                destdir="${build.classes.main}" includeantruntime="false" source="${source.version}" target="${target.version}"
                memorymaximumsize="512M">
             <src path="${build.src.java}"/>
@@ -844,7 +846,7 @@
     </path>
     <target name="stress-build" depends="build" description="build stress tool">
     	<mkdir dir="${stress.build.classes}" />
-        <javac debug="true" debuglevel="${debuglevel}" destdir="${stress.build.classes}" includeantruntime="true" source="${source.version}" target="${target.version}">
+        <javac debug="true" debuglevel="${debuglevel}" encoding="utf-8" destdir="${stress.build.classes}" includeantruntime="true" source="${source.version}" target="${target.version}">
             <src path="${stress.build.src}" />
             <classpath>
                 <path refid="cassandra.classes" />
@@ -1177,6 +1179,7 @@
     <javac
      debug="true"
      debuglevel="${debuglevel}"
+     encoding="utf-8"
      destdir="${test.classes}"
      includeantruntime="true"
      source="${source.version}"