diff --git a/build/build.xml b/build/build.xml
index 6528e5cc986..1674c833b0d 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -222,8 +222,8 @@
 
     <!-- Unzip AVR tools -->
     <antcall target="unzip">
-      <param name="archive_file" value="${staging_folder}/avr-toolchain-mac32-gcc-4.8.1.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/avr-toolchain-mac32-gcc-4.8.1.zip" />
+      <param name="archive_file" value="${staging_folder}/avr-toolchain-mac32-3.4.4.zip" />
+      <param name="archive_url" value="http://downloads.arduino.cc/avr-toolchain-mac32-3.4.4.zip" />
       <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
       <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
     </antcall>
@@ -506,8 +506,8 @@
 
     <!-- Unzip AVR tools -->
     <antcall target="unzip">
-      <param name="archive_file" value="${staging_folder}/avr-toolchain-linux32-gcc-4.8.1.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/avr-toolchain-linux32-gcc-4.8.1.zip" />
+      <param name="archive_file" value="${staging_folder}/avr-toolchain-linux32-3.4.4.zip" />
+      <param name="archive_url" value="http://downloads.arduino.cc/avr-toolchain-linux32-3.4.4.zip" />
       <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
       <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
     </antcall>
@@ -524,8 +524,8 @@
 
     <!-- Unzip AVR tools -->
     <antcall target="unzip">
-      <param name="archive_file" value="${staging_folder}/avr-toolchain-linux64-gcc-4.8.1.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/avr-toolchain-linux64-gcc-4.8.1.zip" />
+      <param name="archive_file" value="${staging_folder}/avr-toolchain-linux64-3.4.4.zip" />
+      <param name="archive_url" value="http://downloads.arduino.cc/avr-toolchain-linux64-3.4.4.zip" />
       <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
       <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
     </antcall>
@@ -708,8 +708,8 @@
 
     <!-- Unzip AVR tools -->
     <antcall target="unzip">
-      <param name="archive_file" value="${staging_folder}/avr-toolchain-win32-gcc-4.8.1.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/avr-toolchain-win32-gcc-4.8.1.zip" />
+      <param name="archive_file" value="${staging_folder}/avr-toolchain-win32-3.4.4.zip" />
+      <param name="archive_url" value="http://downloads.arduino.cc/avr-toolchain-win32-3.4.4.zip" />
       <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
       <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
     </antcall>
diff --git a/build/linux/avr-toolchain-linux32-3.4.4.zip.sha b/build/linux/avr-toolchain-linux32-3.4.4.zip.sha
new file mode 100644
index 00000000000..b38c7f5d7f5
--- /dev/null
+++ b/build/linux/avr-toolchain-linux32-3.4.4.zip.sha
@@ -0,0 +1 @@
+2d154f238fb22fad5aaf78ad04cabedaca9ea8c5
diff --git a/build/linux/avr-toolchain-linux32-gcc-4.8.1.zip.sha b/build/linux/avr-toolchain-linux32-gcc-4.8.1.zip.sha
deleted file mode 100644
index 88d2ab8ea60..00000000000
--- a/build/linux/avr-toolchain-linux32-gcc-4.8.1.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-60f9edb4dd033109e22ee9e87cb6f45efd15882e
diff --git a/build/linux/avr-toolchain-linux64-3.4.4.zip.sha b/build/linux/avr-toolchain-linux64-3.4.4.zip.sha
new file mode 100644
index 00000000000..c9aec7ff310
--- /dev/null
+++ b/build/linux/avr-toolchain-linux64-3.4.4.zip.sha
@@ -0,0 +1 @@
+15e97a6b70ef6e3de1ca604123b9b7ec4f8bf80a
diff --git a/build/linux/avr-toolchain-linux64-gcc-4.8.1.zip.sha b/build/linux/avr-toolchain-linux64-gcc-4.8.1.zip.sha
deleted file mode 100644
index 2cb2bdfec98..00000000000
--- a/build/linux/avr-toolchain-linux64-gcc-4.8.1.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-5b0131ac2ccf20637d16ecc40a0ef2fae48fe73a
diff --git a/build/macosx/avr-toolchain-mac32-3.4.4.zip.sha b/build/macosx/avr-toolchain-mac32-3.4.4.zip.sha
new file mode 100644
index 00000000000..21337fedf30
--- /dev/null
+++ b/build/macosx/avr-toolchain-mac32-3.4.4.zip.sha
@@ -0,0 +1 @@
+b7e7f3b43b40ab02d768c3b0ffc04d8b714e5be3
diff --git a/build/macosx/avr-toolchain-mac32-gcc-4.8.1.zip.sha b/build/macosx/avr-toolchain-mac32-gcc-4.8.1.zip.sha
deleted file mode 100644
index 19cd41f7b1a..00000000000
--- a/build/macosx/avr-toolchain-mac32-gcc-4.8.1.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-c1c15b14ede121884d17c0360e1f1ad15fb5c98f
diff --git a/build/windows/avr-toolchain-win32-3.4.4.zip.sha b/build/windows/avr-toolchain-win32-3.4.4.zip.sha
new file mode 100644
index 00000000000..6ca79013fb2
--- /dev/null
+++ b/build/windows/avr-toolchain-win32-3.4.4.zip.sha
@@ -0,0 +1 @@
+1ed3cdbdde1d30f75c0ee18efe25961aa033bce2
diff --git a/build/windows/avr-toolchain-win32-gcc-4.8.1.zip.sha b/build/windows/avr-toolchain-win32-gcc-4.8.1.zip.sha
deleted file mode 100644
index e3946fb0d76..00000000000
--- a/build/windows/avr-toolchain-win32-gcc-4.8.1.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-21577a37f6f438a25903a3338c448385c0c87aeb