diff --git a/build/build.xml b/build/build.xml
index 3fd7ac440..5401c0485 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -88,7 +88,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.4-arduino2" />
-  <property name="AVRDUDE-VERSION" value="6.3.0-arduino8" />
+  <property name="AVRDUDE-VERSION" value="6.3.0-arduino9" />
   <property name="arduinoOTA-VERSION" value="1.0.0" />
 
   <!-- Libraries required for running arduino -->
diff --git a/build/linux/avrdude-6.3.0-arduino8-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino8-i686-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 05e6e6040..000000000
--- a/build/linux/avrdude-6.3.0-arduino8-i686-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-8e3941f694d17d80dfea9a3cad7d3ec13e64284f
diff --git a/build/linux/avrdude-6.3.0-arduino8-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino8-x86_64-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 3a7e41691..000000000
--- a/build/linux/avrdude-6.3.0-arduino8-x86_64-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-d6cc64c9d8faa7a5dc83d2b3b3c4aef0f92f8f1b
diff --git a/build/linux/avrdude-6.3.0-arduino8-armhf-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2.sha
similarity index 100%
rename from build/linux/avrdude-6.3.0-arduino8-armhf-pc-linux-gnu.tar.bz2.sha
rename to build/linux/avrdude-6.3.0-arduino9-armhf-pc-linux-gnu.tar.bz2.sha
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
new file mode 100644
index 000000000..2c7e131c2
--- /dev/null
+++ b/build/linux/avrdude-6.3.0-arduino9-i686-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000..1d2b02dc3
--- /dev/null
+++ b/build/linux/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+28546bfcb6e6c8f326020c0b8df7e46cca71b25a
diff --git a/build/macosx/avrdude-6.3.0-arduino8-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avrdude-6.3.0-arduino8-i386-apple-darwin11.tar.bz2.sha
deleted file mode 100644
index cf5122f47..000000000
--- a/build/macosx/avrdude-6.3.0-arduino8-i386-apple-darwin11.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-b0ecf552e27c35cd79411b220b68cb980860f505
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
new file mode 100644
index 000000000..7c2e108be
--- /dev/null
+++ b/build/macosx/avrdude-6.3.0-arduino9-i386-apple-darwin11.tar.bz2.sha
@@ -0,0 +1 @@
+0ea78df7016daaa53a0c774618bea72f33617afa
diff --git a/build/windows/avrdude-6.3.0-arduino8-i686-w64-mingw32.zip.sha b/build/windows/avrdude-6.3.0-arduino8-i686-w64-mingw32.zip.sha
deleted file mode 100644
index e337fc1c9..000000000
--- a/build/windows/avrdude-6.3.0-arduino8-i686-w64-mingw32.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-2799d620d4ea3933cb88c1e3e39e9f407ec3fef7
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
new file mode 100644
index 000000000..0c7ce435b
--- /dev/null
+++ b/build/windows/avrdude-6.3.0-arduino9-i686-w64-mingw32.zip.sha
@@ -0,0 +1 @@
+90b367fb9b07c0427e491841efbbf15fd3cd0565
diff --git a/hardware/package_index_bundled.json b/hardware/package_index_bundled.json
index c404be653..d86b2d79c 100644
--- a/hardware/package_index_bundled.json
+++ b/hardware/package_index_bundled.json
@@ -58,7 +58,7 @@
             {
               "packager": "arduino",
               "name": "avrdude",
-              "version": "6.3.0-arduino8"
+              "version": "6.3.0-arduino9"
             },
             {
               "packager": "arduino",
@@ -71,42 +71,42 @@
       "tools": [
         {
           "name": "avrdude",
-          "version": "6.3.0-arduino8",
+          "version": "6.3.0-arduino9",
           "systems": [
             {
               "size": "644550",
               "checksum": "SHA-256:25a6834ae48019fccf37024236a1f79fe21760414292a4f3fa058d937ceee1ce",
               "host": "arm-linux-gnueabihf",
-              "archiveFileName": "avrdude-6.3.0-arduino8-armhf-pc-linux-gnu.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino8-armhf-pc-linux-gnu.tar.bz2"
+              "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"
             },
             {
-              "size": "697268",
-              "checksum": "SHA-256:be8a33a7ec01bb7123279466ffa31371e0aa4fccefffcc23ce71810b59531947",
+              "size": "697309",
+              "checksum": "SHA-256:bfa06bc042dff252d3a8eded98da159484e75b46d2697da4d9446dcd2aea8465",
               "host": "i386-apple-darwin11",
-              "archiveFileName": "avrdude-6.3.0-arduino8-i386-apple-darwin11.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino8-i386-apple-darwin11.tar.bz2"
+              "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"
             },
             {
-              "size": "711544",
-              "checksum": "SHA-256:85f38d02e2398d3b7f93da2ca8b830ee65bb73f66cc7a7b30c466d3cebf2da6e",
+              "size": "711229",
+              "checksum": "SHA-256:c8cccb84e2fe49ee837b24f0a60a99e9c371dae26e84c5b0b22b6b6aab2f1f6a",
               "host": "x86_64-linux-gnu",
-              "archiveFileName": "avrdude-6.3.0-arduino8-x86_64-pc-linux-gnu.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino8-x86_64-pc-linux-gnu.tar.bz2"
+              "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": "701718",
-              "checksum": "SHA-256:8e2e4bc71d22e9d11ed143763b97f3aa2d164cdeee678a9deaf5b36e245b2d20",
+              "size": "701590",
+              "checksum": "SHA-256:4235a2d58e3c3224c603d6c5f0610507ed6c48ebf4051fdcce9f77a7646e218b",
               "host": "i686-linux-gnu",
-              "archiveFileName": "avrdude-6.3.0-arduino8-i686-pc-linux-gnu.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino8-i686-pc-linux-gnu.tar.bz2"
+              "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": "645996",
-              "checksum": "SHA-256:3a7592f6c33efd658b820c73d1058d3c868a297cbddb37da5644973c3b516d5e",
+              "size": "645974",
+              "checksum": "SHA-256:f3c5cfa8d0b3b0caee81c5b35fb6acff89c342ef609bf4266734c6266a256d4f",
               "host": "i686-mingw32",
-              "archiveFileName": "avrdude-6.3.0-arduino8-i686-w64-mingw32.zip",
-              "url": "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino8-i686-w64-mingw32.zip"
+              "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"
             }
           ]
         },