diff --git a/build.xml b/build.xml
index f9f71cef36..eee49105c8 100644
--- a/build.xml
+++ b/build.xml
@@ -266,7 +266,9 @@
 
   <!-- Directory where these 3rd party libraries will live -->
   <property name="lib.dir" value="lib"/>
-	<property name="legacy.dir" location="legacy"/>
+
+  <!-- Currently just for old version of jdom needed for Anakia -->
+  <property name="legacy.dir" value="legacy"/>
   
   <!-- Directory where Optional 3rd party libraries will live -->
   <property name="lib.opt" value="lib/opt"/>
@@ -297,6 +299,7 @@
   <property name="excalibur-i18n.jar" value="${lib.dir}/excalibur-i18n-1.1.jar"/>
   <property name="excalibur-compatibility.jar" value="${lib.dir}/excalibur-compatibility-1.1.jar"/>
   <property name="batik-awt-util.jar" value="${lib.dir}/batik-awt-util.jar"/>
+  <property name="jcharts.jar" value="${lib.dir}/jCharts-0.7.5.jar"/>
   <property name="junit.jar" value="${lib.dir}/junit.jar"/>
   <property name="logkit.jar" value="${lib.dir}/logkit-1.2.jar"/>
   <property name="excalibur-datasource.jar" value="${lib.dir}/excalibur-datasource-1.1.1.jar"/>
@@ -315,11 +318,14 @@
   <property name="soap.jar" value="${lib.dir}/soap.jar"/>
   <property name="tidy.jar" value="${lib.dir}/Tidy.jar"/>
 
+  <!-- The following jars are only needed for source distributions -->
+  <property name="velocity.jar" value="${lib.dir}/velocity-1.4-dev.jar"/>
+
+  <!-- Jars for binary release -->
   <patternset id="external.jars">
     <include name="LICENSE"/>
     <include name="NOTICE"/>
     <include name="README"/>
-    <include name="INSTALL"/>
     <include name="${lib.dir}/*.html"/>
     <include name="${lib.dir}/LICENSE*.*"/>
     <include name="${avalon-framework.jar}"/>
@@ -330,6 +336,7 @@
     <include name="${excalibur-logger.jar}"/>
     <include name="${excalibur-i18n.jar}"/>
     <include name="${excalibur-compatibility.jar}"/>
+    <include name="${jcharts.jar}"/>
     <include name="${junit.jar}"/>
     <include name="${logkit.jar}"/>
     <include name="${xalan.jar}"/>
@@ -896,23 +903,26 @@ some of its classes - at present JMeter can only run from jar files.
     <property name="jms.present" value="assume"/>
   </target>
 
-  <!-- list of files needed for a binary distribution -->
+  <!-- list of files needed for a binary distribution (excluding library files) -->
   <patternset id="dist.binaries">
     <include name="LICENSE"/>
     <include name="NOTICE"/>
     <include name="README"/>
-    <include name="INSTALL"/>
     <include name="${dest.jar.jmeter}/ApacheJMeter.jar"/>
+    <include name="${dest.jar.jmeter}/BeanShell*.bshrc"/>
     <include name="${dest.jar.jmeter}/jmeter*"/>
+    <include name="${dest.jar.jmeter}/logkit.xml"/>
     <include name="${dest.jar.jmeter}/upgrade.properties"/>
     <include name="${dest.jar.jmeter}/saveservice.properties"/>
     <include name="${dest.jar.jmeter}/users.*"/>
-    <include name="${dest.jar.jmeter}/testfiles/**"/>
+    <!-- Exclude any files that might be present from testing the release -->
+    <exclude name="${dest.jar.jmeter}/*.log"/>
     <include name="${dest.jar}/"/>
     <include name="${dest.printable_docs}/**"/>
     <include name="${extras.dir}/**"/>
     <include name="${lib.dir}/jorphan.jar"/>
     <include name="${lib.dir}/htmlparser.jar"/>
+    <include name="${lib.dir}/junit/test.jar"/>
   </patternset>
 
   <!--
@@ -925,23 +935,26 @@ some of its classes - at present JMeter can only run from jar files.
     <include name="LICENSE"/>
     <include name="NOTICE"/>
     <include name="README"/>
-    <include name="INSTALL"/>
     <include name="${src.dir}/**"/>
     <include name="${src.docs}/**"/>
-    <include name="build.*"/>
-    <include name="lcp.bat"/>
+    <include name="${src.test}/**"/>
+    <include name="build.xml"/>
     <include name="${dest.jar.jmeter}/jmeter*.bat"/>
     <include name="${dest.jar.jmeter}/jmeter*.properties"/>
     <include name="${dest.jar.jmeter}/log4j.conf"/>
     <include name="${dest.jar.jmeter}/testfiles/**"/>
-    <include name="eclipse.classpath*"/>
+    <exclude name="${dest.jar.jmeter}/testfiles/*.out"/>
+    <include name="eclipse.classpath"/>
+    <include name="eclipse.readme"/>
+    <include name="${lib.dir}/jar_usage.txt"/>
+    <include name="fb-*.x*"/>
+    <include name="KEYS.txt"/>
   </patternset>
   
   	<!-- Files to be included in full download -->
 	<patternset id="dist_bin_files">
   		<patternset refid="dist.binaries"/>
   		<patternset refid="external.jars"/>
-  		<include name="${dest.printable_docs}/**"/>
   		<include name="${dest.docs}/**"/>
   		<exclude name="${dest.docs}/api/**"/>
   	</patternset>
@@ -952,6 +965,8 @@ some of its classes - at present JMeter can only run from jar files.
   		<!--patternset refid="external.jars"/-->
   		<patternset refid="dist.sources"/>
   		<include name="${dest.docs}/api/**"/>
+		<include name="${velocity.jar}"/>
+		<include name="${legacy.dir}/"/>
   	</patternset>
 
 	<!-- Invoke with -Djmeter.version=m.n