diff --git a/build/avr-1.6.21.tar.bz2.sha b/build/avr-1.6.21.tar.bz2.sha
deleted file mode 100644
index 9ad0b29fa..000000000
--- a/build/avr-1.6.21.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-18a6ba7ec3af0a52864d97f05f7c5f07d5d971c6
diff --git a/build/avr-1.6.22.tar.bz2.sha b/build/avr-1.6.22.tar.bz2.sha
new file mode 100644
index 000000000..68ceb71de
--- /dev/null
+++ b/build/avr-1.6.22.tar.bz2.sha
@@ -0,0 +1 @@
+e17e987ff1abb431a33a2b9ef44faaee184fbf03
diff --git a/build/build.xml b/build/build.xml
index 55abc457e..3040ea272 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -91,7 +91,7 @@
   <property name="LIBLISTSERIAL-VERSION" value="1.4.0" />
   <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="AVRCORE-VERSION" value="1.6.22" />
   <property name="arduinoOTA-VERSION" value="1.2.1" />
 
   <!-- Libraries required for running arduino -->
diff --git a/hardware/package_index_bundled.json b/hardware/package_index_bundled.json
index 84e70a382..b2c8e385d 100644
--- a/hardware/package_index_bundled.json
+++ b/hardware/package_index_bundled.json
@@ -12,15 +12,15 @@
         {
           "name": "Arduino AVR Boards",
           "architecture": "avr",
-          "version": "1.6.20",
+          "version": "1.6.22",
           "category": "Arduino",
           "help": {
             "online": "http://www.arduino.cc/en/Reference/HomePage"
           },
-          "url": "http://downloads.arduino.cc/cores/avr-1.6.20.tar.bz2",
-          "archiveFileName": "avr-1.6.20.tar.bz2",
-          "checksum": "SHA-256:61f3d59a2ab2e9191230e91e79ee91c05f32b32c33129d34d76ef87e56d257e1",
-          "size": "4897949",
+          "url": "http://downloads.arduino.cc/cores/avr-1.6.22.tar.bz2",
+          "archiveFileName": "avr-1.6.22.tar.bz2",
+          "checksum": "SHA-256:e6399b2a687dd8485cbbfcbfbbd4f8e2e15fe535bbcfd1d81bf93d01e31f7d76",
+          "size": "4907422",
           "boards": [
             {"name": "Arduino Yún"},
             {"name": "Arduino/Genuino Uno"},
@@ -53,12 +53,12 @@
             {
               "packager": "arduino",
               "name": "avr-gcc",
-              "version": "4.9.2-atmel3.5.4-arduino2"
+              "version": "5.4.0-atmel3.6.1-arduino2"
             },
             {
               "packager": "arduino",
               "name": "avrdude",
-              "version": "6.3.0-arduino9"
+              "version": "6.3.0-arduino14"
             },
             {
               "packager": "arduino",
@@ -70,84 +70,84 @@
       ],
       "tools": [
         {
-          "name": "avrdude",
-          "version": "6.3.0-arduino9",
+          "name": "avr-gcc",
+          "version": "5.4.0-atmel3.6.1-arduino2",
           "systems": [
             {
-              "size": "644550",
-              "checksum": "SHA-256:25a6834ae48019fccf37024236a1f79fe21760414292a4f3fa058d937ceee1ce",
+              "size": "30644597",
+              "checksum": "SHA-256:b4e2ce5c70b88d3a0f7e303a0a3cc7e5a39a96a5e7f9ea7ea0af3ccfda0f60cc",
               "host": "arm-linux-gnueabihf",
-              "archiveFileName": "avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2"
+              "archiveFileName": "avr-gcc-5.4.0-atmel3.6.1-arduino1-armhf-pc-linux-gnu.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/avr-gcc-5.4.0-atmel3.6.1-arduino1-armhf-pc-linux-gnu.tar.bz2"
             },
             {
-              "size": "697309",
-              "checksum": "SHA-256:bfa06bc042dff252d3a8eded98da159484e75b46d2697da4d9446dcd2aea8465",
+              "size": "31894498",
+              "checksum": "SHA-256:abc50137543ba73e227b4d1b8510fff50a474bacd24f2c794f852904963849f8",
               "host": "i386-apple-darwin11",
-              "archiveFileName": "avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2"
+              "archiveFileName": "avr-gcc-5.4.0-atmel3.6.1-arduino2-i386-apple-darwin11.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/avr-gcc-5.4.0-atmel3.6.1-arduino2-i386-apple-darwin11.tar.bz2"
             },
             {
-              "size": "711229",
-              "checksum": "SHA-256:c8cccb84e2fe49ee837b24f0a60a99e9c371dae26e84c5b0b22b6b6aab2f1f6a",
-              "host": "x86_64-linux-gnu",
-              "archiveFileName": "avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2"
-            },
-            {
-              "size": "701590",
-              "checksum": "SHA-256:4235a2d58e3c3224c603d6c5f0610507ed6c48ebf4051fdcce9f77a7646e218b",
-              "host": "i686-linux-gnu",
-              "archiveFileName": "avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2"
-            },
-            {
-              "size": "645974",
-              "checksum": "SHA-256:f3c5cfa8d0b3b0caee81c5b35fb6acff89c342ef609bf4266734c6266a256d4f",
+              "size": "45923772",
+              "checksum": "SHA-256:7eb5691a379b547798fae535b05d68bc02d3969f12d051b8a5a5f2f350ab0a7f",
               "host": "i686-mingw32",
-              "archiveFileName": "avrdude-6.3.0-arduino9-i686-w64-mingw32.zip",
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-i686-w64-mingw32.zip"
+              "archiveFileName": "avr-gcc-5.4.0-atmel3.6.1-arduino2-i686-w64-mingw32.zip",
+              "url": "http://downloads.arduino.cc/tools/avr-gcc-5.4.0-atmel3.6.1-arduino2-i686-w64-mingw32.zip"
+            },
+            {
+              "size": "33022916",
+              "checksum": "SHA-256:51f87e04f3cdaa73565c751051ac118e02904ad8478f1475b300e1bffcd5538f",
+              "host": "i686-linux-gnu",
+              "archiveFileName": "avr-gcc-5.4.0-atmel3.6.1-arduino2-i686-pc-linux-gnu.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/avr-gcc-5.4.0-atmel3.6.1-arduino2-i686-pc-linux-gnu.tar.bz2"
+            },
+            {
+              "size": "33522375",
+              "checksum": "SHA-256:05422b0d73b10357c12ea938f02cf50529422b89a4722756e70024aed3e69185",
+              "host": "x86_64-linux-gnu",
+              "archiveFileName": "avr-gcc-5.4.0-atmel3.6.1-arduino2-x86_64-pc-linux-gnu.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/avr-gcc-5.4.0-atmel3.6.1-arduino2-x86_64-pc-linux-gnu.tar.bz2"
             }
           ]
         },
         {
-          "name": "avr-gcc",
-          "version": "4.9.2-atmel3.5.4-arduino2",
+          "name": "avrdude",
+          "version": "6.3.0-arduino14",
           "systems": [
             {
-              "size": "27764772",
-              "checksum": "SHA-256:ee36009e19bd238d1f6351cbc9aa5db69714761f67dec4c1d69d5d5d7758720c",
+              "size": "219616",
+              "checksum": "SHA-256:d1a06275490d59a431c419788bbc53ffd5a79510dac1a35e63cf488621ba5589",
               "host": "arm-linux-gnueabihf",
-              "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"
+              "archiveFileName": "avrdude-6.3.0-arduino14-armhf-pc-linux-gnu.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino14-armhf-pc-linux-gnu.tar.bz2"
             },
             {
-              "size": "28574644",
-              "checksum": "SHA-256:67b3ed3555eacf0b4fc6f62240773b9f0220171fe4de26bb8d711547fc884730",
+              "size": "256917",
+              "checksum": "SHA-256:47d03991522722ce92120c60c4118685b7861909d895f34575001137961e4a63",
               "host": "i386-apple-darwin11",
-              "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"
+              "archiveFileName": "avrdude-6.3.0-arduino14-i386-apple-darwin12.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino14-i386-apple-darwin11.tar.bz2"
             },
             {
-              "size": "44386446",
-              "checksum": "SHA-256:6044551cd729d88ea6ffcccf10aad1934c5b164d61f4f5890b0e78524ffff853",
-              "host": "i686-mingw32",
-              "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": "29723974",
-              "checksum": "SHA-256:63a9d4cebbac06fd5fa8f48a2e2ba7d513837dcddc97f560129b4e466af901b5",
-              "host": "i686-linux-gnu",
-              "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": "30374404",
-              "checksum": "SHA-256:19480217f1524d78467b83cd742f503182bbcc76b5440093261f146828aa588c",
+              "size": "253366",
+              "checksum": "SHA-256:7986e8f3059353dc08f9234f7dbc98d9b2fa2242f046f02a8243a060f7358bfc",
               "host": "x86_64-linux-gnu",
-              "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"
+              "archiveFileName": "avrdude-6.3.0-arduino14-x86_64-pc-linux-gnu.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino14-x86_64-pc-linux-gnu.tar.bz2"
+            },
+            {
+              "size": "244293",
+              "checksum": "SHA-256:4f100e3843c635064997df91d2a079ab15cd30d1d7fa227280abe6a7c3bc74ca",
+              "host": "i686-linux-gnu",
+              "archiveFileName": "avrdude-6.3.0-arduino14-i686-pc-linux-gnu.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino14-i686-pc-linux-gnu.tar.bz2"
+            },
+            {
+              "size": "328363",
+              "checksum": "SHA-256:69293e0de2eff8de89f553477795c25005f674a320bbba4b0222beb0194aa297",
+              "host": "i686-mingw32",
+              "archiveFileName": "avrdude-6.3.0-arduino14-i686-w64-mingw32.zip",
+              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino14-i686-w64-mingw32.zip"
             }
           ]
         },