diff --git a/build/build.xml b/build/build.xml
index ba4b4db50..3fd7ac440 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -87,7 +87,7 @@
 
   <property name="ARDUINO-BUILDER-VERSION" value="1.3.24" />
   <property name="LIBLISTSERIAL-VERSION" value="1.4.0" />
-  <property name="AVRGCC-VERSION" value="4.9.2-atmel3.5.3-arduino2" />
+  <property name="AVRGCC-VERSION" value="4.9.2-atmel3.5.4-arduino2" />
   <property name="AVRDUDE-VERSION" value="6.3.0-arduino8" />
   <property name="arduinoOTA-VERSION" value="1.0.0" />
 
diff --git a/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-armhf-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-armhf-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index b12002e8b..000000000
--- a/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-armhf-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-e2377fc99bf9e93daf4957e5fde65d244a3ccbff
diff --git a/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index c53084637..000000000
--- a/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-4c1ca6daf11c210f99927a60261c4a17024eb9ed
diff --git a/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 96b49e1b3..000000000
--- a/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-7eff6a3bb6b73f933a941a8962f820e63a79ed7e
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
new file mode 100644
index 000000000..ebfe8ab49
--- /dev/null
+++ b/build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..457e8e3df
--- /dev/null
+++ b/build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..0f6462137
--- /dev/null
+++ b/build/linux/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+7db39e171782e5b3cafad2fed918fcab93938603
diff --git a/build/macosx/avr-gcc-4.9.2-atmel3.5.3-arduino2-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avr-gcc-4.9.2-atmel3.5.3-arduino2-i386-apple-darwin11.tar.bz2.sha
deleted file mode 100644
index 4fc954751..000000000
--- a/build/macosx/avr-gcc-4.9.2-atmel3.5.3-arduino2-i386-apple-darwin11.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-bd0a579e8b1613a97ed74ef018505f63872ec023
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
new file mode 100644
index 000000000..3a72dba38
--- /dev/null
+++ b/build/macosx/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2.sha
@@ -0,0 +1 @@
+431bc914b508d3ced22914b11096f73cd7f19f3e
diff --git a/build/windows/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-mingw32.zip.sha b/build/windows/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-mingw32.zip.sha
deleted file mode 100644
index e8e9b3426..000000000
--- a/build/windows/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-mingw32.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-1fb69fc6c9dce945d5e595cb9e76a8d2d4cebae8
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
new file mode 100644
index 000000000..5c09ce10f
--- /dev/null
+++ b/build/windows/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-mingw32.zip.sha
@@ -0,0 +1 @@
+78c77b2a5724c627861684cc8fe45a39e57cc0f4
diff --git a/hardware/package_index_bundled.json b/hardware/package_index_bundled.json
index 671659070..c404be653 100644
--- a/hardware/package_index_bundled.json
+++ b/hardware/package_index_bundled.json
@@ -53,7 +53,7 @@
             {
               "packager": "arduino",
               "name": "avr-gcc",
-              "version": "4.9.2-atmel3.5.3-arduino2"
+              "version": "4.9.2-atmel3.5.4-arduino2"
             },
             {
               "packager": "arduino",
@@ -112,42 +112,42 @@
         },
         {
           "name": "avr-gcc",
-          "version": "4.9.2-atmel3.5.3-arduino2",
+          "version": "4.9.2-atmel3.5.4-arduino2",
           "systems": [
             {
-              "size": "27400889",
-              "checksum": "SHA-256:77f300d519bc6b9a25df17b36cb303218e9a258c059b2f6bff8f71a0d8f96821",
+              "size": "27764772",
+              "checksum": "SHA-256:ee36009e19bd238d1f6351cbc9aa5db69714761f67dec4c1d69d5d5d7758720c",
               "host": "arm-linux-gnueabihf",
-              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.3-arduino2-armhf-pc-linux-gnu.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-armhf-pc-linux-gnu.tar.bz2"
+              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-armhf-pc-linux-gnu.tar.bz2"
             },
             {
-              "size": "27048070",
-              "checksum": "SHA-256:311258af188defe24a4b341e4e1f4dc93ca6c80516d3e3b55a2fc07a7050248b",
+              "size": "28574644",
+              "checksum": "SHA-256:67b3ed3555eacf0b4fc6f62240773b9f0220171fe4de26bb8d711547fc884730",
               "host": "i386-apple-darwin11",
-              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.3-arduino2-i386-apple-darwin11.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-i386-apple-darwin11.tar.bz2"
+              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-i386-apple-darwin11.tar.bz2"
             },
             {
-              "size": "43847945",
-              "checksum": "SHA-256:f8e6ede8746c70be01ec79a30803277cd94360cc5b2e104762da0fbcf536fcc6",
+              "size": "44386446",
+              "checksum": "SHA-256:6044551cd729d88ea6ffcccf10aad1934c5b164d61f4f5890b0e78524ffff853",
               "host": "i686-mingw32",
-              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-mingw32.zip",
-              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-mingw32.zip"
+              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-mingw32.zip",
+              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-mingw32.zip"
             },
             {
-              "size": "29292729",
-              "checksum": "SHA-256:f108951e7c4dc90926d1fc76cc27549f6ea63c702a2bb7ff39647a19ae86ec68",
+              "size": "29723974",
+              "checksum": "SHA-256:63a9d4cebbac06fd5fa8f48a2e2ba7d513837dcddc97f560129b4e466af901b5",
               "host": "i686-linux-gnu",
-              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2"
+              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-i686-pc-linux-gnu.tar.bz2"
             },
             {
-              "size": "29882960",
-              "checksum": "SHA-256:3903a6d1bb9fdd91727e504b5993d5501f119bcb7f99f7aee98a2101e5629188",
+              "size": "30374404",
+              "checksum": "SHA-256:19480217f1524d78467b83cd742f503182bbcc76b5440093261f146828aa588c",
               "host": "x86_64-linux-gnu",
-              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2"
+              "archiveFileName": "avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.4-arduino2-x86_64-pc-linux-gnu.tar.bz2"
             }
           ]
         },