diff --git a/.travis.yml b/.travis.yml
index 317899b..41580fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,17 +2,29 @@ language: c
 
 compiler: gcc
 
-before_install:
-  - sudo add-apt-repository -y ppa:terry.guo/gcc-arm-embedded
+# use containers
+sudo: false
 
 install:
-  - sudo apt-get update
-  - sudo apt-get install -y gcc-arm-none-eabi
+  - wget --output-document=extras/toolchain.tar.bz2 https://launchpad.net/gcc-arm-embedded/4.9/4.9-2015-q3-update/+download/gcc-arm-none-eabi-4_9-2015q3-20150921-linux.tar.bz2
+  - cd extras
+  - tar -xf toolchain.tar.bz2
+  - cd ..
+
+addons:
+  apt_packages:
+    - lib32bz2-1.0
+    - lib32ncurses5
+    - lib32z1
+    - cppcheck
 
 script:
   - make
 
 env:
+  global:
+    - PATH=/home/travis/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$TRAVIS_BUILD_DIR/extras/gcc-arm-none-eabi-4_9-2015q3/bin
+
   matrix:
     - VARIANT_NAME=arduino_due
     - VARIANT_NAME=atmel_sam4s_xplained
@@ -23,13 +35,6 @@ env:
     - VARIANT_NAME=logos_arachnio_due
     - VARIANT_NAME=poppy_core
 
-#addons:
-#  apt:
-#    sources:
-#      - gcc-arm-embedded
-#    packages:
-#      - gcc-arm-none-eabi
-
 #deploy:
 #  provider: releases
 #  user: "GITHUB USERNAME"
diff --git a/Makefile b/Makefile
index b565c5b..9efcbb8 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,6 @@ endif
 CORE_VERSION := $(shell grep version= $(ROOT_PATH)/module/platform.txt | sed 's/version=//g')
 PACKAGE_NAME := $(basename $(notdir $(ROOT_PATH)))
 FOLDER2ARCHIVE := module
-#../$(basename $(notdir $(ROOT_PATH)))
 
 # specify default variant, if not provided
 VARIANT_NAME ?= atmel_sam4s_xplained
@@ -42,6 +41,7 @@ print_info:
 print_info_travis:
 	@echo ----------------------------------------------------------
 	@echo Travis-CI envvars
+	@echo PATH                = $(PATH)
 	@echo TRAVIS_OS_NAME      = $(TRAVIS_OS_NAME)
 	@echo TRAVIS_LANGUAGE     = $(TRAVIS_LANGUAGE)
 	@echo TRAVIS_REPO_SLUG    = $(TRAVIS_REPO_SLUG)