diff --git a/build/avr-1.6.20.tar.bz2.sha b/build/avr-1.6.20.tar.bz2.sha
deleted file mode 100644
index 3ffcd339f..000000000
--- a/build/avr-1.6.20.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-9b858371109590c2392cbf1c38936623e737848b
diff --git a/build/avr-1.6.21.tar.bz2.sha b/build/avr-1.6.21.tar.bz2.sha
new file mode 100644
index 000000000..9ad0b29fa
--- /dev/null
+++ b/build/avr-1.6.21.tar.bz2.sha
@@ -0,0 +1 @@
+18a6ba7ec3af0a52864d97f05f7c5f07d5d971c6
diff --git a/build/build.xml b/build/build.xml
index 19d1c8ad1..55abc457e 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -89,9 +89,9 @@
 
   <property name="ARDUINO-BUILDER-VERSION" value="1.3.25" />
   <property name="LIBLISTSERIAL-VERSION" value="1.4.0" />
-  <property name="AVRGCC-VERSION" value="4.9.2-atmel3.5.4-arduino2" />
-  <property name="AVRDUDE-VERSION" value="6.3.0-arduino9" />
-  <property name="AVRCORE-VERSION" value="1.6.20" />
+  <property name="AVRGCC-VERSION" value="5.4.0-atmel3.6.1-arduino2" />
+  <property name="AVRDUDE-VERSION" value="6.3.0-arduino14" />
+  <property name="AVRCORE-VERSION" value="1.6.21" />
   <property name="arduinoOTA-VERSION" value="1.2.1" />
 
   <!-- Libraries required for running arduino -->
diff --git a/build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index ebfe8ab49..000000000
--- a/build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-ba879ff3e212c1d13cf18bd74c72032a07564826
diff --git a/build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 457e8e3df..000000000
--- a/build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-fd449aa8a7f6f56c6e94226f9b0b80ce99dddb24
diff --git a/build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 0f6462137..000000000
--- a/build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-7db39e171782e5b3cafad2fed918fcab93938603
diff --git a/build/linux/avr-gcc-5.4.0-atmel3.6.1-arduino2-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-5.4.0-atmel3.6.1-arduino2-i686-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 000000000..ff51d800d
--- /dev/null
+++ b/build/linux/avr-gcc-5.4.0-atmel3.6.1-arduino2-i686-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+b75cb7e52e35cec5dd20043a7dd07115f798d05f
diff --git a/build/linux/avr-gcc-5.4.0-atmel3.6.1-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-5.4.0-atmel3.6.1-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 000000000..4ffaea9b8
--- /dev/null
+++ b/build/linux/avr-gcc-5.4.0-atmel3.6.1-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+ed08ae8fac281e54abf66e01b6b9e702ad555263
diff --git a/build/linux/avrdude-6.3.0-arduino14-armhf-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino14-armhf-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 000000000..89e8e20eb
--- /dev/null
+++ b/build/linux/avrdude-6.3.0-arduino14-armhf-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+ee4d67eb51b51354f53c280c16129a519a0a2037
diff --git a/build/linux/avrdude-6.3.0-arduino14-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino14-i686-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 000000000..b45c9fd48
--- /dev/null
+++ b/build/linux/avrdude-6.3.0-arduino14-i686-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+10ab537cdaba8d04f2265af59e11d16abff0fe0f
diff --git a/build/linux/avrdude-6.3.0-arduino14-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino14-x86_64-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 000000000..525ba3cab
--- /dev/null
+++ b/build/linux/avrdude-6.3.0-arduino14-x86_64-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+45829cae9278ea0ad7ba2fc6ff6c2ed79befc425
diff --git a/build/linux/avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index b892097e6..000000000
--- a/build/linux/avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-81ab2665d306c5ddd28eba4348e64e7db71af24a
diff --git a/build/linux/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 2c7e131c2..000000000
--- a/build/linux/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-989bb9e20618fd1007e09ac0b51c8cac27447aa9
diff --git a/build/linux/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 1d2b02dc3..000000000
--- a/build/linux/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-28546bfcb6e6c8f326020c0b8df7e46cca71b25a
diff --git a/build/macosx/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2.sha
deleted file mode 100644
index 3a72dba38..000000000
--- a/build/macosx/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-431bc914b508d3ced22914b11096f73cd7f19f3e
diff --git a/build/macosx/avr-gcc-5.4.0-atmel3.6.1-arduino2-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avr-gcc-5.4.0-atmel3.6.1-arduino2-i386-apple-darwin11.tar.bz2.sha
new file mode 100644
index 000000000..2d1fcadde
--- /dev/null
+++ b/build/macosx/avr-gcc-5.4.0-atmel3.6.1-arduino2-i386-apple-darwin11.tar.bz2.sha
@@ -0,0 +1 @@
+a63b8fb618cd4caac98fece39cbf3badf96193ca
diff --git a/build/macosx/avrdude-6.3.0-arduino14-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avrdude-6.3.0-arduino14-i386-apple-darwin11.tar.bz2.sha
new file mode 100644
index 000000000..1939a7480
--- /dev/null
+++ b/build/macosx/avrdude-6.3.0-arduino14-i386-apple-darwin11.tar.bz2.sha
@@ -0,0 +1 @@
+23c26333fca87a7f72d4be47bbba93995f83f93c
diff --git a/build/macosx/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2.sha
deleted file mode 100644
index 7c2e108be..000000000
--- a/build/macosx/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-0ea78df7016daaa53a0c774618bea72f33617afa
diff --git a/build/windows/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-mingw32.zip.sha b/build/windows/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-mingw32.zip.sha
deleted file mode 100644
index 5c09ce10f..000000000
--- a/build/windows/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-mingw32.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-78c77b2a5724c627861684cc8fe45a39e57cc0f4
diff --git a/build/windows/avr-gcc-5.4.0-atmel3.6.1-arduino2-i686-w64-mingw32.zip.sha b/build/windows/avr-gcc-5.4.0-atmel3.6.1-arduino2-i686-w64-mingw32.zip.sha
new file mode 100644
index 000000000..3c2069e40
--- /dev/null
+++ b/build/windows/avr-gcc-5.4.0-atmel3.6.1-arduino2-i686-w64-mingw32.zip.sha
@@ -0,0 +1 @@
+6e5351d6a8c9e129b3f99504f762aff4e80cf51d
diff --git a/build/windows/avrdude-6.3.0-arduino14-i686-w64-mingw32.zip.sha b/build/windows/avrdude-6.3.0-arduino14-i686-w64-mingw32.zip.sha
new file mode 100644
index 000000000..91bfc1e9b
--- /dev/null
+++ b/build/windows/avrdude-6.3.0-arduino14-i686-w64-mingw32.zip.sha
@@ -0,0 +1 @@
+3da15b7f25e3b2818365e212196d2f1725f5562d
diff --git a/build/windows/avrdude-6.3.0-arduino9-i686-w64-mingw32.zip.sha b/build/windows/avrdude-6.3.0-arduino9-i686-w64-mingw32.zip.sha
deleted file mode 100644
index 0c7ce435b..000000000
--- a/build/windows/avrdude-6.3.0-arduino9-i686-w64-mingw32.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-90b367fb9b07c0427e491841efbbf15fd3cd0565