diff --git a/ant-compress-1.4.jar b/ant-compress-1.4.jar
new file mode 100644
index 000000000..3b8c93084
Binary files /dev/null and b/ant-compress-1.4.jar differ
diff --git a/build_common.xml b/build_common.xml
index cc44d0b29..714f2b368 100644
--- a/build_common.xml
+++ b/build_common.xml
@@ -29,6 +29,8 @@
         <classpath path="${TESTLIBDIR}/jacocoant.jar"/>
     </taskdef>    
     
+    <taskdef name="cpio" classname="org.apache.ant.compress.taskdefs.Cpio" classpath="${basedir}/ant-compress-1.4.jar;${basedir}/commons-compress-1.9.jar" />
+    
     <path id="ant-deb.classpath">
         <pathelement location="${basedir}/ant-deb-0.0.1.jar"/>
     </path>
@@ -236,15 +238,18 @@
             </fileset>
         </copy>
         
-        <tar destfile="${app.installer.dir}/flat/base.pkg/Payload" compression="gzip">
+        <tempfile deleteonexit="true" property="app.cpio.temp" prefix="cpio"/>
+        
+        <cpio destfile="${app.cpio.temp}" format="odc">
             <tarfileset dir="${app.installer.dir}/root" uid="0" gid="80" includes="Applications/${app.osx.dir}.app/Contents/MacOS/${app.osx.dir}"  filemode="755" />            
             <tarfileset dir="${app.installer.dir}/root" uid="0" gid="80">
                 <exclude name="Applications/${app.osx.dir}.app/Contents/Resources/${app.script}" />
                 <exclude name="Applications/${app.osx.dir}.app/Contents/MacOS/${app.osx.dir}" />
             </tarfileset>
-            <tarfileset dir="${app.installer.dir}/root" uid="0" gid="80" includes="Applications/${app.osx.dir}.app/Contents/Resources/${app.script}" filemode="755" />  
-        </tar>
-        
+            <tarfileset dir="${app.installer.dir}/root" uid="0" gid="80" includes="Applications/${app.osx.dir}.app/Contents/Resources/${app.script}" filemode="755" />        
+        </cpio>
+        <gzip src="${app.cpio.temp}" destfile="${app.installer.dir}/flat/base.pkg/Payload" />
+        <delete file="${app.cpio.temp}" />
         <resourcecount property="app.installer.files.number">
             <fileset dir="${app.installer.dir}/root" />
         </resourcecount>
@@ -310,10 +315,7 @@
        </fileset>
        <pathconvert refid="xarfileset" property="xarconverted" pathsep=" ">
            <map from="${app.installer.dir}/flat/" to="" />
-       </pathconvert>
-       <echo>
-           ${xarconverted}
-       </echo>
+       </pathconvert>       
        <exec executable="xar" failonerror="true" dir="${app.installer.dir}/flat">
             <arg value="--compression" />
             <arg value="none" />
diff --git a/commons-compress-1.9.jar b/commons-compress-1.9.jar
new file mode 100644
index 000000000..14e7e868e
Binary files /dev/null and b/commons-compress-1.9.jar differ