diff --git a/build.xml b/build.xml
index ab4dd71417..3d76d14926 100644
--- a/build.xml
+++ b/build.xml
@@ -59,6 +59,10 @@
     <property name="test.unit.src" value="${test.dir}/unit"/>
     <property name="test.long.src" value="${test.dir}/long"/>
     <property name="dist.dir" value="${build.dir}/dist"/>
+	
+	<property name="source.version" value="1.6"/>
+	<property name="target.version" value="1.6"/>
+	
     <condition property="version" value="${base.version}">
       <isset property="release"/>
     </condition>
@@ -674,12 +678,12 @@
         <echo message="${ant.project.name}: ${ant.file}"/>
         <!-- Order matters! -->
         <javac debug="true" debuglevel="${debuglevel}"
-               destdir="${build.classes.thrift}" includeantruntime="false">
+               destdir="${build.classes.thrift}" includeantruntime="false" source="${source.version}" target="${target.version}">
             <src path="${interface.thrift.dir}/gen-java"/>
             <classpath refid="cassandra.classpath"/>
         </javac>
         <javac debug="true" debuglevel="${debuglevel}"
-               destdir="${build.classes.main}" includeantruntime="false">
+               destdir="${build.classes.main}" includeantruntime="false" source="${source.version}" target="${target.version}">
             <src path="${build.src.java}"/>
             <src path="${build.src.gen-java}"/>
             <classpath refid="cassandra.classpath"/>
@@ -1010,7 +1014,9 @@
     <javac
      debug="true"
      debuglevel="${debuglevel}"
-     destdir="${test.classes}">
+     destdir="${test.classes}"
+     source="${source.version}" 
+     target="${target.version}">
       <classpath>
         <path refid="cassandra.classpath"/>
       </classpath>