diff --git a/client/build.xml b/client/build.xml
index 812b8c87a0..feffef585a 100644
--- a/client/build.xml
+++ b/client/build.xml
@@ -95,20 +95,31 @@
   <!-- =========================================== -->
   <target name="clientDistribute" depends="clientCompile" unless="jar.uptodate">
     <!-- get included jars -->
-    <unjar src="..\base\Base.jar" dest="${build.dir}" />
-    <unjar src="..\dbPort\dbPort.jar" dest="${build.dir}" />
-    <unjar src="..\looks\CLooks.jar" dest="${build.dir}" />
-    <unjar src="..\print\Print.jar" dest="${build.dir}" />
-    <unjar src="..\extend\Extend.jar" dest="${build.dir}" />
+	<!--
+    <unjar src="..\base\Base.jar" dest="${build.dir}" overwrite="true"/>
+    <unjar src="..\dbPort\dbPort.jar" dest="${build.dir}" overwrite="true"/>
+    <unjar src="..\looks\CLooks.jar" dest="${build.dir}" overwrite="true"/>
+    <unjar src="..\print\Print.jar" dest="${build.dir}" overwrite="true"/>
+    <unjar src="..\extend\Extend.jar" dest="${build.dir}" overwrite="true"/>
+    -->
     <!-- <unjar src="..\interfaces\Interfaces.jar" dest="${build.dir}" /> -->
+	<!--
   	<unjar src="..\JasperReports\CompiereJasper.jar" dest="${build.dir}" />
     <delete dir="${build.dir}/META-INF"/>
-
+	-->
+	
     <!-- put everything from ${build.dir} into Adempiere.jar file -->
     <jar
 	  jarfile="${dist.dir}/Adempiere.jar" 
-	  basedir="${build.dir}" 
+	  basedir="${build.dir}"
+	  duplicate="preserve"
 	  index="yes">
+	  <fileset dir="../base/build" />
+	  <fileset dir="../dbPort/build" />
+	  <fileset dir="../looks/build" />
+	  <fileset dir="../print/build" />
+	  <fileset dir="../extend/build" />
+	  <fileset file="../JasperReports/CompiereJasper.jar"/>
       <manifest>
         <attribute name="Specification-Title" value="Adempiere"/>
         <attribute name="Specification-Version" value="${env.ADEMPIERE_VERSION}"/>