diff --git a/.travis.yml b/.travis.yml
index d53d141..7921776 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ env:
 #    - ARDUINO_VERSION=1.0.6
     - ARDUINO_VERSION=1.6.9
 #    - ARDUINO_VERSION=1.6.13
-#    - ARDUINO_VERSION=1.8.4
+#    - ARDUINO_VERSION=1.8.5
   matrix:
     - OPTIBOOT_TARGET=bobuino
     - OPTIBOOT_TARGET=diecimila
diff --git a/docs/arduino-gcc-versions.md b/docs/arduino-gcc-versions.md
index 85be6d3..2ba6ca7 100644
--- a/docs/arduino-gcc-versions.md
+++ b/docs/arduino-gcc-versions.md
@@ -38,4 +38,5 @@ based on Linux versions.
 |1.8.1    |4.9.2    |same as 1.8.0| |
 |1.8.2    |4.9.2    |recompiled, new toolchains, lot of changes| |
 |1.8.3    |4.9.2    |same as 1.8.2| |
-|1.8.4    |4.9.2    |same as 1.8.2| yes |
+|1.8.4    |4.9.2    |same as 1.8.2| |
+|1.8.5    |4.9.2    |same as 1.8.2| yes |
diff --git a/scripts/travis-build.sh b/scripts/travis-build.sh
index 786baf8..daf7a23 100755
--- a/scripts/travis-build.sh
+++ b/scripts/travis-build.sh
@@ -30,11 +30,11 @@ function download_and_unpack()
 
     # check if tools are already in place
     if [ -d arduino-$1/hardware/tools/avr ]; then
-	echo "Package $ver already downloaded and extracted, skipping"
+	echo "Arduino version $1 already downloaded and extracted, skipping"
 	return
     fi
 
-    echo "Downloading version $1"
+    echo "Downloading Arduino version $1"
     
     # default package extension
     local arduExt="tar.xz"