diff --git a/build/build.xml b/build/build.xml
index a496252..f4d9305 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -153,7 +153,7 @@
 
     <mkdir dir="${target.path}/reference"/>
 
-    <!-- Unzip documentation -->
+    <!-- Unzip documentation>
     <antcall target="unzip">
       <param name="archive_file" value="shared/reference-1.6.6-3.zip" />
       <param name="archive_url" value="http://downloads.arduino.cc/reference-1.6.6-3.zip" />
@@ -171,7 +171,7 @@
       <param name="archive_url" value="http://downloads.arduino.cc/Edison_help_files-1.6.2.zip" />
       <param name="final_folder" value="${target.path}/reference/Edison_help_files" />
       <param name="dest_folder" value="${target.path}/reference/" />
-    </antcall>
+    </antcall-->
 
     <!-- Write the revision file! -->
     <echo file="${target.path}/lib/version.txt" message="${version}" />
@@ -553,14 +553,14 @@
     <copy todir="linux/work" file="linux/dist/arduino" />
     <chmod perm="755" file="linux/work/arduino" />
 
-    <antcall target="unzip">
+    <!--antcall target="unzip">
       <param name="archive_file" value="./libastylej-2.05.1.zip" />
       <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1.zip" />
       <param name="final_folder" value="${staging_folder}/libastylej-2.05.1" />
       <param name="dest_folder" value="${staging_folder}" />
     </antcall>
     <copy file="linux/libastylej-2.05.1/libastylej${arch-bits}.so" tofile="linux/work/lib/libastylej.so" />
-    <chmod perm="755" file="linux/work/lib/libastylej.so" />
+    <chmod perm="755" file="linux/work/lib/libastylej.so" /-->
   </target>
 
   <target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
@@ -584,13 +584,13 @@
     </copy>
     <delete dir="${staging_folder}/arduino-builder-linux32" includeemptydirs="true"/>
 
-    <antcall target="avr-toolchain-bundle">
+    <!--antcall target="avr-toolchain-bundle">
       <param name="unpack_target" value="untar"/>
       <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
       <param name="gcc_version" value="4.8.1-arduino5"/>
       <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
       <param name="avrdude_version" value="6.0.1-arduino5"/>
-    </antcall>
+    </antcall-->
 
     <antcall target="package-library-index-json-bundle"/>
   </target>
@@ -616,13 +616,13 @@
     </copy>
     <delete dir="${staging_folder}/arduino-builder-linux64" includeemptydirs="true"/>
 
-    <antcall target="avr-toolchain-bundle">
+    <!--antcall target="avr-toolchain-bundle">
       <param name="unpack_target" value="untar"/>
       <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/>
       <param name="gcc_version" value="4.8.1-arduino5"/>
       <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/>
       <param name="avrdude_version" value="6.0.1-arduino5"/>
-    </antcall>
+    </antcall-->
 
     <antcall target="package-library-index-json-bundle"/>
   </target>
@@ -990,15 +990,18 @@
   <target name="package-library-index-json-bundle">
     <mkdir dir="${staging_folder}/work/${staging_hardware_folder}/../dist/"/>
 
-    <get src="http://downloads.arduino.cc/packages/package_index.json.gz" dest="${staging_folder}/work/${staging_hardware_folder}/../dist/" verbose="true" skipexisting="false" />
-    <gunzip src="${staging_folder}/work/${staging_hardware_folder}/../dist/package_index.json.gz" dest="${staging_folder}/work/${staging_hardware_folder}/../dist/"/>
-    <delete file="${staging_folder}/work/${staging_hardware_folder}/../dist/package_index.json.gz"/>
-
-    <get src="http://downloads.arduino.cc/packages/package_index.json.sig" dest="${staging_folder}/work/${staging_hardware_folder}/../dist/" verbose="true" skipexisting="false" />
-
-    <get src="http://downloads.arduino.cc/libraries/library_index.json.gz" dest="${staging_folder}/work/${staging_hardware_folder}/../dist/" verbose="true" skipexisting="false" />
-    <gunzip src="${staging_folder}/work/${staging_hardware_folder}/../dist/library_index.json.gz" dest="${staging_folder}/work/${staging_hardware_folder}/../dist/"/>
-    <delete file="${staging_folder}/work/${staging_hardware_folder}/../dist/library_index.json.gz"/>
+    <exec executable="cp" failonerror="true">
+      <arg value="../package_index.json" />
+      <arg value="${staging_folder}/work/${staging_hardware_folder}/../dist/" />
+    </exec>
+    <exec executable="cp" failonerror="true">
+      <arg value="../package_index.json.sig" />
+      <arg value="${staging_folder}/work/${staging_hardware_folder}/../dist/" />
+    </exec>
+    <exec executable="cp" failonerror="true">
+      <arg value="../library_index.json" />
+      <arg value="${staging_folder}/work/${staging_hardware_folder}/../dist/" />
+    </exec>
 
     <delete dir="${staging_folder}/work/${staging_hardware_folder}/tmp"/>
   </target>