diff --git a/build/build.xml b/build/build.xml
index 5401c0485..be3172fdf 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -89,7 +89,7 @@
   <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="arduinoOTA-VERSION" value="1.0.0" />
+  <property name="arduinoOTA-VERSION" value="1.1.1" />
 
   <!-- Libraries required for running arduino -->
   <fileset dir=".." id="runtime.jars">
@@ -487,7 +487,7 @@
       <param name="gcc_version" value="${AVRGCC-VERSION}"/>
       <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i386-apple-darwin11.tar.bz2"/>
       <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
-      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-osx.tar.bz2"/>
+      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-darwin_amd64.tar.bz2"/>
       <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
     </antcall>
 
@@ -700,7 +700,7 @@
       <param name="gcc_version" value="${AVRGCC-VERSION}"/>
       <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
       <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
-      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linuxarm.tar.bz2"/>
+      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_arm.tar.bz2"/>
       <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
     </antcall>
   </target>
@@ -718,7 +718,7 @@
       <param name="gcc_version" value="${AVRGCC-VERSION}"/>
       <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
       <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
-      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux32.tar.bz2"/>
+      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_386.tar.bz2"/>
       <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
     </antcall>
   </target>
@@ -736,7 +736,7 @@
       <param name="gcc_version" value="${AVRGCC-VERSION}"/>
       <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
       <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
-      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux64.tar.bz2"/>
+      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-linux_amd64.tar.bz2"/>
       <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
     </antcall>
   </target>
@@ -1055,7 +1055,7 @@
       <param name="gcc_version" value="${AVRGCC-VERSION}"/>
       <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-w64-mingw32.zip"/>
       <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
-      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-windows.zip"/>
+      <param name="arduinoOTA_archive_file" value="arduinoOTA-${arduinoOTA-VERSION}-windows_386.zip"/>
       <param name="arduinoOTA_version" value="${arduinoOTA-VERSION}"/>
     </antcall>
   </target>
@@ -1153,7 +1153,7 @@
 
     <move file="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/avr" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
     <move file="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
-    <move file="${staging_folder}/work/${staging_hardware_folder}/tmp/arduinoOTA/" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
+    <move file="${staging_folder}/work/${staging_hardware_folder}/tmp/arduinoOTA/arduinoOTA/" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
 
     <echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avrdude=${avrdude_version}${line.separator}"/>
     <echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.arduinoOTA=${arduinoOTA_version}${line.separator}"/>
diff --git a/build/linux/arduinoOTA-1.0.0-linux32.tar.bz2.sha b/build/linux/arduinoOTA-1.0.0-linux32.tar.bz2.sha
deleted file mode 100644
index 51e6c12e8..000000000
--- a/build/linux/arduinoOTA-1.0.0-linux32.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-ea57315a2dc1ebadd219684ad720acc29914e5ea
diff --git a/build/linux/arduinoOTA-1.0.0-linux64.tar.bz2.sha b/build/linux/arduinoOTA-1.0.0-linux64.tar.bz2.sha
deleted file mode 100644
index a2a96b0fe..000000000
--- a/build/linux/arduinoOTA-1.0.0-linux64.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-597dabb3a04c8036c38985c424e11be245a2a88c
diff --git a/build/linux/arduinoOTA-1.0.0-linuxarm.tar.bz2.sha b/build/linux/arduinoOTA-1.0.0-linuxarm.tar.bz2.sha
deleted file mode 100644
index 26e04174b..000000000
--- a/build/linux/arduinoOTA-1.0.0-linuxarm.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-9f0b23cc318f4cf88561884b4857a292438685e8
diff --git a/build/linux/arduinoOTA-1.1.1-linux_386.tar.bz2.sha b/build/linux/arduinoOTA-1.1.1-linux_386.tar.bz2.sha
new file mode 100644
index 000000000..fcb87f259
--- /dev/null
+++ b/build/linux/arduinoOTA-1.1.1-linux_386.tar.bz2.sha
@@ -0,0 +1 @@
+0706774128b910342c8d95dcd598a424a998a923
diff --git a/build/linux/arduinoOTA-1.1.1-linux_amd64.tar.bz2.sha b/build/linux/arduinoOTA-1.1.1-linux_amd64.tar.bz2.sha
new file mode 100644
index 000000000..b090447ae
--- /dev/null
+++ b/build/linux/arduinoOTA-1.1.1-linux_amd64.tar.bz2.sha
@@ -0,0 +1 @@
+69a301f10e0aa0895545851037dac354d058864b
diff --git a/build/linux/arduinoOTA-1.1.1-linux_arm.tar.bz2.sha b/build/linux/arduinoOTA-1.1.1-linux_arm.tar.bz2.sha
new file mode 100644
index 000000000..4bb175497
--- /dev/null
+++ b/build/linux/arduinoOTA-1.1.1-linux_arm.tar.bz2.sha
@@ -0,0 +1 @@
+4a4df0746debf7768a5ffae7201d533d0ca79685
diff --git a/build/macosx/arduinoOTA-1.0.0-osx.tar.bz2.sha b/build/macosx/arduinoOTA-1.0.0-osx.tar.bz2.sha
deleted file mode 100644
index 3d8571bdf..000000000
--- a/build/macosx/arduinoOTA-1.0.0-osx.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-3d9f65a3313ca4447e502df82ce6f433552090e5
diff --git a/build/macosx/arduinoOTA-1.1.1-darwin_amd64.tar.bz2.sha b/build/macosx/arduinoOTA-1.1.1-darwin_amd64.tar.bz2.sha
new file mode 100644
index 000000000..92cb17c7d
--- /dev/null
+++ b/build/macosx/arduinoOTA-1.1.1-darwin_amd64.tar.bz2.sha
@@ -0,0 +1 @@
+4ae94bbe639cab1e5d295a73fc95f56cbf3d5d51
diff --git a/build/windows/arduinoOTA-1.0.0-windows.zip.sha b/build/windows/arduinoOTA-1.0.0-windows.zip.sha
deleted file mode 100644
index 245449da5..000000000
--- a/build/windows/arduinoOTA-1.0.0-windows.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-474366736c4a9a15ab8f228e2c198be44fced561
diff --git a/build/windows/arduinoOTA-1.1.1-windows_386.zip.sha b/build/windows/arduinoOTA-1.1.1-windows_386.zip.sha
new file mode 100644
index 000000000..b445ee2ef
--- /dev/null
+++ b/build/windows/arduinoOTA-1.1.1-windows_386.zip.sha
@@ -0,0 +1 @@
+d649b42b7b66896c14878d0f27b7e09d7717ee47
diff --git a/hardware/package_index_bundled.json b/hardware/package_index_bundled.json
index d86b2d79c..ecd97c858 100644
--- a/hardware/package_index_bundled.json
+++ b/hardware/package_index_bundled.json
@@ -63,7 +63,7 @@
             {
               "packager": "arduino",
               "name": "arduinoOTA",
-              "version": "1.0.0"
+              "version": "1.1.1"
             }
           ]
         }
@@ -153,42 +153,42 @@
         },
         {
           "name": "arduinoOTA",
-          "version": "1.0.0",
+          "version": "1.1.1",
           "systems": [
             {
-              "size": "2044124",
-              "checksum": "SHA-256:850a86876403cb45c944590a8cc7f9d8ef6d53ed853f7a9593ec395c4c1c6b2d",
+              "size": "2045036",
+              "checksum": "SHA-256:7ac91ef1d5b357c0ceb790be02ef54986db598ba5a42fffbd6c8ecbdd6a271ef",
               "host": "i686-linux-gnu",
-              "archiveFileName": "arduinoOTA-1.0.0-linux32.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.0.0-linux32.tar.bz2"
+              "archiveFileName": "arduinoOTA-1.1.1-linux_386.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_386.tar.bz2"
             },
             {
-              "size": "2178772",
-              "checksum": "SHA-256:f01f25e02787492a8a30414230635adae76ed85228045437433892d185991f9e",
+              "size": "2178288",
+              "checksum": "SHA-256:eb5ad0a457dd7f610f7f9b85454399c36755673d61a16f9d07cdfcbbb32ec277",
               "host": "x86_64-linux-gnu",
-              "archiveFileName": "arduinoOTA-1.0.0-linux64.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.0.0-linux64.tar.bz2"
+              "archiveFileName": "arduinoOTA-1.1.1-linux_amd64.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_amd64.tar.bz2"
             },
             {
-              "size": "1961623",
-              "checksum": "SHA-256:0ca6c0a93bfad50be0b6e62dc51ba6c3267b809bab4ec91ef9606ab7d838e46b",
+              "size": "1962115",
+              "checksum": "SHA-256:e4880d83df3d3f6f4b7b7bcde161e80a0556877468803a3c6066ee4ad18a374c",
               "host": "arm-linux-gnueabihf",
-              "archiveFileName": "arduinoOTA-1.0.0-linuxarm.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.0.0-linuxarm.tar.bz2"
+              "archiveFileName": "arduinoOTA-1.1.1-linux_arm.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_arm.tar.bz2"
             },
             {
-              "size": "2180617",
-              "checksum": "SHA-256:e63c6034da2c1a7fe453eaa29c22df88627cc0aa3c5cbab7635c19367b74ee59",
+              "size": "2181376",
+              "checksum": "SHA-256:a1ce7cf578982f3af5e4fab6b5839e44830d7a41cb093faba5c4b45952a6fa55",
               "host": "i386-apple-darwin11",
-              "archiveFileName": "arduinoOTA-1.0.0-osx.tar.bz2",
-              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.0.0-osx.tar.bz2"
+              "archiveFileName": "arduinoOTA-1.1.1-darwin_amd64.tar.bz2",
+              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.1.1-darwin_amd64.tar.bz2"
             },
             {
-              "size": "2247970",
-              "checksum": "SHA-256:7bced1489217e07661ea1e75702a10a874b54f6146e2414ee47684c7eac014d1",
+              "size": "2248431",
+              "checksum": "SHA-256:b2d3610c77f969a68cd75b6ea66bf63ec10c263937009d99147fbcd975c90006",
               "host": "i686-mingw32",
-              "archiveFileName": "arduinoOTA-1.0.0-windows.zip",
-              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.0.0-windows.zip"
+              "archiveFileName": "arduinoOTA-1.1.1-windows_386.zip",
+              "url": "http://downloads.arduino.cc/tools/arduinoOTA-1.1.1-windows_386.zip"
             }
           ]
         }