diff --git a/.travis.yml b/.travis.yml
index 0335257..d53d141 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.3
+#    - ARDUINO_VERSION=1.8.4
   matrix:
     - OPTIBOOT_TARGET=bobuino
     - OPTIBOOT_TARGET=diecimila
diff --git a/docs/arduino-gcc-versions.md b/docs/arduino-gcc-versions.md
index eee11db..85be6d3 100644
--- a/docs/arduino-gcc-versions.md
+++ b/docs/arduino-gcc-versions.md
@@ -37,4 +37,5 @@ based on Linux versions.
 |1.8.0    |4.9.2    |same as 1.6.12, another patch for avrdude 6.3 | |
 |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| yes |
+|1.8.3    |4.9.2    |same as 1.8.2| |
+|1.8.4    |4.9.2    |same as 1.8.2| yes |