diff --git a/build/build.xml b/build/build.xml
index 831997170..5847a3fb6 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -345,9 +345,9 @@
   <target name="macosx-build-common-avr-toolchain" unless="light_bundle">
     <antcall target="avr-toolchain-bundle">
       <param name="unpack_target" value="untar"/>
-      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino-i386-apple-darwin11.tar.bz2"/>
+      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino1-i386-apple-darwin11.tar.bz2"/>
       <param name="gcc_version" value="4.8.1-arduino/"/>
-      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino-i386-apple-darwin11.tar.bz2"/>
+      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino1-i386-apple-darwin11.tar.bz2"/>
       <param name="avrdude_version" value="6.0.1-arduino"/>
     </antcall>
 
@@ -605,9 +605,9 @@
   <target name="linux32-build" depends="linux-build" unless="light_bundle" description="Build linux (32-bit) version">
     <antcall target="avr-toolchain-bundle">
       <param name="unpack_target" value="untar"/>
-      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino-i686-pc-linux-gnu.tar.bz2"/>
+      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino1-i686-pc-linux-gnu.tar.bz2"/>
       <param name="gcc_version" value="4.8.1-arduino/"/>
-      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino-i686-pc-linux-gnu.tar.bz2"/>
+      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino1-i686-pc-linux-gnu.tar.bz2"/>
       <param name="avrdude_version" value="6.0.1-arduino"/>
     </antcall>
 
@@ -625,9 +625,9 @@
   <target name="linux64-build" depends="linux-build"  unless="light_bundle" description="Build linux (64-bit) version">
     <antcall target="avr-toolchain-bundle">
       <param name="unpack_target" value="untar"/>
-      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino-x86_64-pc-linux-gnu.tar.bz2"/>
+      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino1-x86_64-pc-linux-gnu.tar.bz2"/>
       <param name="gcc_version" value="4.8.1-arduino/"/>
-      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino-x86_64-pc-linux-gnu.tar.bz2"/>
+      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino1-x86_64-pc-linux-gnu.tar.bz2"/>
       <param name="avrdude_version" value="6.0.1-arduino"/>
     </antcall>
 
@@ -880,9 +880,9 @@
   <target name="windows-build-avr-toolchain">
     <antcall target="avr-toolchain-bundle">
       <param name="unpack_target" value="unzip"/>
-      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino-i686-mingw32.zip"/>
+      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino1-i686-mingw32.zip"/>
       <param name="gcc_version" value="4.8.1-arduino/"/>
-      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino-i686-mingw32.zip"/>
+      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino1-i686-mingw32.zip"/>
       <param name="avrdude_version" value="6.0.1-arduino"/>
     </antcall>
   </target>
diff --git a/build/linux/avr-gcc-4.8.1-arduino-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.8.1-arduino-x86_64-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 44d226d35..000000000
--- a/build/linux/avr-gcc-4.8.1-arduino-x86_64-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-eb89261725ed45b9bf57d25bd94a302adc6c928d
diff --git a/build/linux/avr-gcc-4.8.1-arduino1-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.8.1-arduino1-x86_64-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 000000000..4d4d8723e
--- /dev/null
+++ b/build/linux/avr-gcc-4.8.1-arduino1-x86_64-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+6b5ab4da89e479f3bad75312239d282f95f901b1
diff --git a/build/linux/avrdude-6.0.1-arduino-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.0.1-arduino-x86_64-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 804f6baca..000000000
--- a/build/linux/avrdude-6.0.1-arduino-x86_64-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-cbaa00eb3fadc8cdd86f52d9668825755de11dde
diff --git a/build/linux/avrdude-6.0.1-arduino1-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.0.1-arduino1-x86_64-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 000000000..1c61b708b
--- /dev/null
+++ b/build/linux/avrdude-6.0.1-arduino1-x86_64-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+364c5af25c7a5b20b0f926fbd888688894fbb211