diff --git a/build.xml b/build.xml
index f396668f9f..1a62fa342f 100644
--- a/build.xml
+++ b/build.xml
@@ -15,51 +15,9 @@
     -->
     <path id="cassandra.classpath">
         <pathelement location="${build.classes}"/>
-        <pathelement location="${build.lib}/activation.jar"/>
-        <pathelement location="${build.lib}/antlr-runtime-3.0.1.jar"/>
-        <pathelement location="${build.lib}/hadoop-core.jar"/>
-        <pathelement location="${build.lib}/asm-all-2.2.1.jar"/>
-        <pathelement location="${build.lib}/azul-collections.jar"/>
-        <pathelement location="${build.lib}/bcel-5.2.jar"/>
-        <pathelement location="${build.lib}/commons-cli-1.1.jar"/>
-        <pathelement location="${build.lib}/commons-javaflow-1.0-SNAPSHOT.jar"/>
-        <pathelement location="${build.lib}/colt.jar"/>
-        <pathelement location="${build.lib}/libfb303.jar"/> 
-        <pathelement location="${build.lib}/commons-logging-1.0.4.jar"/>
-        <pathelement location="${build.lib}/FastInfoset.jar"/>
-        <pathelement location="${build.lib}/commons-math-1.1.jar"/>
-        <pathelement location="${build.lib}/flanagan.jar"/>
-        <pathelement location="${build.lib}/j2ee.jar"/>
-        <pathelement location="${build.lib}/groovy-1.5.6.jar"/>
-        <pathelement location="${build.lib}/groovy-engine.jar"/>
-        <pathelement location="${build.lib}/javacore.jar"/>
-        <pathelement location="${build.lib}/javolution.jar"/>
-        <pathelement location="${build.lib}/jaxb1-impl.jar"/>
-        <pathelement location="${build.lib}/jaxb-api.jar"/>
-        <pathelement location="${build.lib}/jaxb-impl.jar"/>
-        <pathelement location="${build.lib}/jaxb-xjc.jar"/>
-        <pathelement location="${build.lib}/jaxws-2_0.jar"/>
-        <pathelement location="${build.lib}/jaxws-api.jar"/>
-        <pathelement location="${build.lib}/jaxws-rt.jar"/>
-        <pathelement location="${build.lib}/jettison.jar"/>
-        <pathelement location="${build.lib}/jline-0.9.94.jar"/>
-        <pathelement location="${build.lib}/JSAP-2.1.jar"/>
-        <pathelement location="${build.lib}/jsr173_api.jar"/>
-        <pathelement location="${build.lib}/jsr181-api.jar"/>
-        <pathelement location="${build.lib}/jsr250-api.jar"/>
-        <pathelement location="${build.lib}/libthrift.jar"/>
-        <pathelement location="${build.lib}/log4j-1.2.8.jar"/>
-        <pathelement location="${build.lib}/lucene-core-2.2.0.jar"/>
-        <pathelement location="${build.lib}/messaging.jar"/>
-        <pathelement location="${build.lib}/mysql-connector-java-5.0.7-bin.jar"/>
-        <pathelement location="${build.lib}/sjsxp.jar"/>
-        <pathelement location="${build.lib}/xerces.jar"/>
-        <pathelement location="${build.lib}/xpp3.jar"/>
-        <pathelement location="${build.lib}/xstream.jar"/>
-        <pathelement location="${build.lib}/trove-2.0.2.jar"/>
-        <pathelement location="${build.lib}/zookeeper-3.0.0.jar"/>
-        <pathelement location="${build.lib}/pcj.jar"/>
-        <pathelement location="${build.lib}/"/>
+        <fileset dir="${build.lib}">
+          <include name="**/*.jar" />
+        </fileset>
     </path>
 
     <!--
diff --git a/lib/antlr-2.7.6.jar b/lib/antlr-2.7.6.jar
deleted file mode 100644
index 3702b645fc..0000000000
Binary files a/lib/antlr-2.7.6.jar and /dev/null differ
diff --git a/lib/antlr-2.7.7.jar b/lib/antlr-2.7.7.jar
deleted file mode 100644
index 5e5f14b355..0000000000
Binary files a/lib/antlr-2.7.7.jar and /dev/null differ
diff --git a/lib/apache-javaflow.jar b/lib/apache-javaflow.jar
deleted file mode 100644
index c67e5dc4e1..0000000000
Binary files a/lib/apache-javaflow.jar and /dev/null differ
diff --git a/lib/commons-collections-3.2.1.jar b/lib/commons-collections-3.2.1.jar
new file mode 100644
index 0000000000..c35fa1fee1
Binary files /dev/null and b/lib/commons-collections-3.2.1.jar differ
diff --git a/lib/commons-lang-2.4.jar b/lib/commons-lang-2.4.jar
new file mode 100644
index 0000000000..532939ecab
Binary files /dev/null and b/lib/commons-lang-2.4.jar differ
diff --git a/lib/dsiutils-1.0.7.jar b/lib/dsiutils-1.0.7.jar
deleted file mode 100644
index 7553a99703..0000000000
Binary files a/lib/dsiutils-1.0.7.jar and /dev/null differ
diff --git a/lib/hadoop-core.jar b/lib/hadoop-core.jar
deleted file mode 100644
index ce6e3179ed..0000000000
Binary files a/lib/hadoop-core.jar and /dev/null differ
diff --git a/lib/log4j-1.2.15.jar b/lib/log4j-1.2.15.jar
new file mode 100644
index 0000000000..c930a6ab4d
Binary files /dev/null and b/lib/log4j-1.2.15.jar differ
diff --git a/lib/log4j-1.2.8.jar b/lib/log4j-1.2.8.jar
deleted file mode 100644
index 493a3ccc13..0000000000
Binary files a/lib/log4j-1.2.8.jar and /dev/null differ
diff --git a/lib/stringtemplate-3.0.jar b/lib/stringtemplate-3.0.jar
deleted file mode 100644
index df5e6e517f..0000000000
Binary files a/lib/stringtemplate-3.0.jar and /dev/null differ
diff --git a/lib/sux4j-1.0.3.jar b/lib/sux4j-1.0.3.jar
deleted file mode 100644
index 60c6767aa0..0000000000
Binary files a/lib/sux4j-1.0.3.jar and /dev/null differ
diff --git a/lib/testng-5.8-jdk15.jar b/lib/testng-5.8-jdk15.jar
new file mode 100644
index 0000000000..80a3bbe4e3
Binary files /dev/null and b/lib/testng-5.8-jdk15.jar differ