diff --git a/build/build.xml b/build/build.xml
index 600a3d165..475cb26c3 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -204,6 +204,25 @@
       <arg value="macosx/dist/tools-universal.zip" />
     </exec>
 
+    <exec executable="unzip">
+      <arg value="-q" />
+      <arg value="-n" />
+      <arg value="-d" />
+      <arg value="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/" />
+      <arg value="macosx/dist/CodeSourcery_arm.zip" />
+    </exec>
+
+    <exec executable="mv">
+      <arg value="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/CodeSourcery_arm" />
+      <arg value="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/g++_arm_none_eabi" />
+    </exec>
+
+    <copy todir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/">    
+      <fileset file="macosx/dist/bossac" />
+    </copy>
+
+    <chmod file="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/bossac" perm="+x" />
+
     <copy todir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr/include/avr">    
       <fileset file="macosx/dist/eeprom.h" />
     </copy>