diff --git a/build/build.xml b/build/build.xml
index ae468d86e..35e6fcc7a 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -20,13 +20,6 @@
   <condition property="platform"
 	     value="linux64"><os family="unix" arch="amd64" /></condition>
 
-  <condition property="arch-bits" value="32">
-    <equals arg1="${platform}" arg2="linux32"/>
-  </condition>
-  <condition property="arch-bits" value="64">
-    <equals arg1="${platform}" arg2="linux64"/>
-  </condition>
-
   <!-- Libraries required for running arduino -->
   <fileset dir=".." id="runtime.jars">
     <include name="core/core.jar" />
@@ -470,15 +463,13 @@
     <copy todir="linux/work" file="linux/dist/arduino" />
     <chmod perm="755" file="linux/work/arduino" />
 
-    <mkdir dir="linux/work/hardware/tools" />
-    <copy file="linux/dist/tools/adk2install" todir="linux/work/hardware/tools" />
-    <copy file="linux/dist/tools/adk2tool" todir="linux/work/hardware/tools" />
-    <copy file="linux/dist/tools/avrdude${arch-bits}" tofile="linux/work/hardware/tools/avrdude" />
-    <copy file="linux/dist/tools/avrdude.conf" todir="linux/work/hardware/tools" />
-    <copy file="linux/dist/tools/bossac${arch-bits}" tofile="linux/work/hardware/tools/bossac" />
+    <copy todir="linux/work/hardware">
+      <fileset dir="linux/dist" includes="tools/**" />
+    </copy>
 
     <chmod perm="755" file="linux/work/hardware/tools/avrdude" />
     <chmod perm="755" file="linux/work/hardware/tools/bossac" />
+    <chmod perm="755" file="linux/work/hardware/tools/bossac64" />
     <chmod perm="755" file="linux/work/hardware/tools/adk2tool" />
     <chmod perm="755" file="linux/work/hardware/tools/adk2install" />
 
diff --git a/build/linux/dist/tools/avrdude32 b/build/linux/dist/tools/avrdude
similarity index 100%
rename from build/linux/dist/tools/avrdude32
rename to build/linux/dist/tools/avrdude
diff --git a/build/linux/dist/tools/bossac32 b/build/linux/dist/tools/bossac
similarity index 100%
rename from build/linux/dist/tools/bossac32
rename to build/linux/dist/tools/bossac