diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..68509d320
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,35 @@
+# Compile Firmware on Travis CI
+# By Simon Peter
+# Updated for Arduino 1.8.5+ by Ted Hess
+#	Remove need to change default build environment
+#	Firmware/ArduinoAddons are not used
+# https://learn.adafruit.com/continuous-integration-arduino-and-you/testing-your-project
+
+language: c
+
+branches:
+  only:
+    - private_build2
+
+before_install:
+#  - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16"
+#  - sleep 3
+#  - export DISPLAY=:1.0
+  - wget http://downloads.arduino.cc/arduino-1.8.5-linux64.tar.xz
+  - tar xf arduino-1.8.5-linux64.tar.xz
+
+install:
+  - cp Firmware/variants/1_75mm_MK2-RAMBo13a-E3Dv6full.h Firmware/Configuration_prusa.h
+
+script:
+  - VARIANTS=$(ls Firmware/variants/)
+  - for VARIANT in $VARIANTS; do
+      arduino-1.8.5/arduino --pref build.path=. --verify --verbose-build --board arduino:avr:mega $PWD/Firmware/Firmware.ino ;
+      cp Firmware.ino.hex "${VARIANT}"ex ;
+    done
+  - mkdir -p prusa3d_fw_$(git rev-parse --short HEAD)/MK1-175mm prusa3d_fw_$(git rev-parse --short HEAD)/MK2-MultiMaterial prusa3d_fw_$(git rev-parse --short HEAD)/MK2
+  - mv *_MK1-RAMBo* prusa3d_fw_$(git rev-parse --short HEAD)/MK1-175mm
+  - mv *_MK2-MultiMaterial-RAMBo* prusa3d_fw_$(git rev-parse --short HEAD)/MK2-MultiMaterial
+  - mv *_MK2-RAMBo* prusa3d_fw_$(git rev-parse --short HEAD)/MK2
+  - zip -r prusa3d_fw_$(git rev-parse --short HEAD).zip prusa3d_fw_* *.pdf
+  - curl --upload-file prusa3d_fw_$(git rev-parse --short HEAD).zip https://transfer.sh/prusa3d_fw_$(git rev-parse --short HEAD).zip
diff --git a/platformio.ini b/platformio.ini
index 9990d7bd1..b916dfe4b 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -19,13 +19,17 @@
 ; $ avrdude -v -p m2560 -c wiring -P /dev/ttyUSB0 -b 115200 -U "flash:w:firmware.hex:i" -D
 
 [platformio]
-src_dir=./Firmware
-lib_dir=/opt/arduino-1.8.4/libraries
-envs_dir=./pbuild
-env_default = rambo
+src_dir		= ./Firmware
+lib_dir		= /opt/arduino-1.8.5/libraries
+envs_dir	= ./pbuild
+env_default	= Prusa3D
 
-[env:rambo]
-platform=atmelavr
-board=reprap_rambo
-framework=arduino
-build_flags = -I$BUILDSRC_DIR -Wall -Wextra
+[env:Prusa3D]
+platform	= atmelavr
+board		= reprap_rambo
+framework	= arduino
+board_f_cpu	= 16000000L
+build_flags	= -I$BUILDSRC_DIR -Wall -Wextra
+; Not needed for Prusa-Firmware
+;extra_scripts	= ./generate_version_header_for_marlin.py
+;build_flags	= -DUSE_AUTOMATIC_VERSIONING -I$BUILDSRC_DIR -Wall -Wextra