diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..282017bad
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,31 @@
+sudo: true
+language: java
+
+jdk:
+  - openjdk6
+
+script:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq ant
+  - pushd build
+  - echo "" | ant dist
+  - popd
+#- bash -x ./generate-appimage
+
+deploy:
+  provider: releases
+  api_key:
+    secure: eKHcAMuC58JZKRsn1QwbiYE4aL/9dZsybDqqHTo1dUo8x9+3fGed/Dci76ItFFS7SmFfIdl6ej8/Uj0nPK/sIE21blKBe3+L0KAJm0TTq3m0ig1suCmMipCsSW+srWYM0hl58+OKagM4FoHKDjsEnzRDv9Z4xtxyvG+7/XLD1dE=
+  skip_cleanup: true
+  file_glob: true
+  file:
+    - '$TRAVIS_BUILD_DIR/build/linux/arduino-*.tar.xz'
+#    - '$TRAVIS_BUILD_DIR/Arduino.AppImage'
+  on:
+    tags: true
+    all_branches: true
+
+notifications:
+  email:
+    on_success: change
+    on_failure: change
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 000000000..d93594bfa
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,67 @@
+version: 0.0.{build}
+
+platform:
+    - x86
+
+skip_commits:
+  message: /\[skip appveyor\]/
+
+shallow_clone: true
+
+matrix:
+    fast_finish: true
+
+init:
+    - git config --global url."https://".insteadOf git://
+
+build_script:
+    - java -version
+    - javac -version
+    - where javac
+    - choco -y install ant
+    - echo ON
+    - echo PATH %PATH%
+    - echo JAVA_HOME %JAVA_HOME%
+    - echo ANT_HOME %ANT_HOME%
+    - SET ANT_HOME=C:\tools\apache-ant-1.9.4
+    - SET PATH=%PATH%;C:\tools\apache-ant-1.9.4\bin
+    - SET JAVA_HOME=C:\Program Files\Java\jdk1.7.0
+    - echo PATH %PATH%
+    - echo JAVA_HOME %JAVA_HOME%
+    - echo ANT_HOME %ANT_HOME%
+    - java -version
+    - javac -version
+    - ant -version
+    - cd build
+    - ant dist < NUL
+#    - SET PATH=C:\MinGW\bin;C:\MinGW\msys\1.0\bin;%PATH%
+#    - make all
+    - for /f %%i in ('git describe --always') do set PRODUCT_VERSION=%%i
+#    - SET PRODUCT_NAME=esptool-%PRODUCT_VERSION%
+#    - SET PLATFORM_NAME=win32
+#    - SET PRODUCT_DIST_NAME=%PRODUCT_NAME%-%PLATFORM_NAME%
+    - echo %PRODUCT_VERSION%
+#    - echo %PRODUCT_DIST_NAME%
+#    - mkdir %PRODUCT_DIST_NAME%
+#    - cp esptool.exe %PRODUCT_DIST_NAME%\esptool.exe
+#    - SET PRODUCT_ZIP=%PRODUCT_DIST_NAME%.zip
+#    - 7z a %PRODUCT_ZIP% %PRODUCT_DIST_NAME%
+#    - appveyor PushArtifact %PRODUCT_ZIP%
+#    - SET PRODUCT_ZIP_SHA=%PRODUCT_ZIP%.sha
+#    - ps: Get-FileHash $env:PRODUCT_ZIP -Algorithm SHA1 | Out-File $env:PRODUCT_ZIP_SHA
+#    - type %PRODUCT_ZIP_SHA%
+#    - appveyor PushArtifact %PRODUCT_ZIP_SHA%
+
+artifacts:
+  - path: build\windows\arduino-*.zip
+
+
+deploy:
+    - provider: GitHub
+      auth_token:
+        secure: 'PGg5fnoBpP1Omzr6f3KIYDiD8J30rretQjSl/MITRpzvSCmN88kM6VDMz1TBGZTA'
+      artifact: /.*\.zip/
+      draft: true
+      prerelease: false
+      on:
+        appveyor_repo_tag: true
diff --git a/build/build.xml b/build/build.xml
index 389467326..6ec61ff44 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -651,6 +651,23 @@
       <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
       <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/avr" />
     </antcall>
+
+    <antcall target="untar">
+      <param name="archive_file" value="${staging_folder}/dist/linux64-xtensa-lx106-elf.tgz" />
+      <param name="archive_url" value="http://download.igrr.me/linux64-xtensa-lx106-elf.tgz" />
+      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/xtensa-lx106-elf" />
+      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
+    </antcall>
+
+    <antcall target="unzip">
+      <param name="archive_file" value="${staging_folder}/esptool-0.4.2-linux64.zip" />
+      <param name="archive_url" value="https://github.com/igrr/esptool-ck/releases/download/0.4.2/esptool-0.4.2-linux64.zip" />
+      <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-linux64" />
+      <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
+    </antcall>
+    <move file="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-linux64/esptool" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool" />
+    <delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-linux64/" />
+
   </target>
 
   <target name="linux32-run" depends="linux32-build" description="Run Linux (32-bit) version">
@@ -907,7 +924,7 @@
       <param name="final_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-win32" />
       <param name="dest_folder" value="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/" />
     </antcall>
-    <move file="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-win32/esptool" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool" />
+    <move file="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-win32/esptool.exe" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool.exe" />
     <delete dir="${staging_folder}/work/${staging_hardware_folder}/tools/esp8266/esptool-0.4.2-win32/" />
  
   </target>
diff --git a/build/linux/dist/linux64-xtensa-lx106-elf.tgz.sha b/build/linux/dist/linux64-xtensa-lx106-elf.tgz.sha
new file mode 100644
index 000000000..19195a689
--- /dev/null
+++ b/build/linux/dist/linux64-xtensa-lx106-elf.tgz.sha
@@ -0,0 +1 @@
+43ca9c53d70655456a28c297526204447f65d9cb
diff --git a/build/linux/esptool-0.4.2-linux64.zip.sha b/build/linux/esptool-0.4.2-linux64.zip.sha
new file mode 100644
index 000000000..49fb5a4eb
--- /dev/null
+++ b/build/linux/esptool-0.4.2-linux64.zip.sha
@@ -0,0 +1 @@
+b89b50beb56f0f355d8d14104fb01d523140fe91
diff --git a/build/macosx/dist/osx-xtensa-lx106-elf.tgz b/build/macosx/dist/osx-xtensa-lx106-elf.tgz
new file mode 100644
index 000000000..d3130247f
Binary files /dev/null and b/build/macosx/dist/osx-xtensa-lx106-elf.tgz differ
diff --git a/build/windows/dist/win32-xtensa-lx106-elf.tgz.sha b/build/windows/dist/win32-xtensa-lx106-elf.tgz.sha
index f33ea5d39..62ea3d8d8 100644
--- a/build/windows/dist/win32-xtensa-lx106-elf.tgz.sha
+++ b/build/windows/dist/win32-xtensa-lx106-elf.tgz.sha
@@ -1 +1 @@
-80a15b3885b262da5801b2cbca9951b6b0542500
+8d52c4bc92aac25a87352f790038a6e1af5241c5
diff --git a/build/windows/esptool-0.4.2-win32.zip.sha b/build/windows/esptool-0.4.2-win32.zip.sha
new file mode 100644
index 000000000..02306041f
--- /dev/null
+++ b/build/windows/esptool-0.4.2-win32.zip.sha
@@ -0,0 +1 @@
+3031f2d590544403f5c1a90dcc7f549b9144b309
diff --git a/build/windows/win32-xtensa-lx106-elf.tgz.sha b/build/windows/win32-xtensa-lx106-elf.tgz.sha
new file mode 100644
index 000000000..15a35a726
--- /dev/null
+++ b/build/windows/win32-xtensa-lx106-elf.tgz.sha
@@ -0,0 +1 @@
+8d52c4bc92aac25a87352f790038a6e1af5241c5
\ No newline at end of file