diff --git a/build.xml b/build.xml
index 7dc08e0257..92bc937acb 100644
--- a/build.xml
+++ b/build.xml
@@ -178,7 +178,7 @@
       </copy> 
       
       <tar compression="gzip" longfile="gnu"
-        destfile="${build.dir}/${final.name}.tgz">
+        destfile="${build.dir}/${final.name}-bin.tar.gz">
 
         <tarfileset dir="${dist.dir}"
           prefix="${final.name}">
@@ -191,6 +191,15 @@
           <include name="bin/cassandra"/>
         </tarfileset>	
       </tar>
+      <tar compression="gzip" longfile="gnu"
+        destfile="${build.dir}/${final.name}-src.tar.gz">
+
+        <tarfileset dir="${basedir}"
+          prefix="${final.name}-src">
+          <include name="**"/>
+          <exclude name="build/**" />
+        </tarfileset>
+      </tar>
     </target>
 
   <target name="build-test" depends="build" description="Build the Cassandra classes">