diff --git a/build.xml b/build.xml
index 31bea38c8e..ee90328d4c 100644
--- a/build.xml
+++ b/build.xml
@@ -731,8 +731,8 @@
       <jar jarfile="${build.dir}/${ant.project.name}-thrift-${version}.jar"
            basedir="${build.classes.thrift}">
         <fileset dir="${build.classes.main}">
-          <include name="org/apache/cassandra/thrift/ITransportFactory.class" />
-          <include name="org/apache/cassandra/thrift/TFramedTransportFactory.class" />
+          <include name="org/apache/cassandra/thrift/ITransportFactory*.class" />
+          <include name="org/apache/cassandra/thrift/TFramedTransportFactory*.class" />
         </fileset>
         <manifest>
           <attribute name="Implementation-Title" value="Cassandra"/>
@@ -742,8 +742,11 @@
       </jar>
 
       <!-- Main Jar -->
-      <jar jarfile="${build.dir}/${final.name}.jar"
-           basedir="${build.classes.main}">
+      <jar jarfile="${build.dir}/${final.name}.jar">
+        <fileset dir="${build.classes.main}">
+          <exclude name="org/apache/cassandra/thrift/ITransportFactory*.class" />
+          <exclude name="org/apache/cassandra/thrift/TFramedTransportFactory*.class" />
+        </fileset>
         <manifest>
         <!-- <section name="org/apache/cassandra/infrastructure"> -->
           <attribute name="Implementation-Title" value="Cassandra"/>