diff --git a/.travis.yml b/.travis.yml
index b4e2c058998c1a73bb138abae6a385886844d23c..7c4adc07ef9512d62e782129f4391eb2fffbbd93 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,27 @@
-# dist: trusty  # Ubuntu 14.04
-dist: xenial # Ubuntu 16.04 
-language: python
-python: 3.7
-branches:
-  only:
-  - gh-pages
-  - /.*/
 before_install:
-  - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys E084DAB9
-  - echo "deb https://cran.rstudio.com/bin/linux/ubuntu trusty/" | sudo tee -a /etc/apt/sources.list
   - sudo apt-get update -y
-  - sudo apt-get install -y r-base
-  - sudo Rscript -e "install.packages('knitr', repos = 'https://', dependencies = TRUE)"
-  - sudo Rscript -e "install.packages('stringr', repos = 'https://cran.rstudio.com', dependencies = TRUE)"
-  - sudo Rscript -e "install.packages('checkpoint', repos = 'https://cran.rstudio.com', dependencies = TRUE)"
-  - sudo Rscript -e "install.packages('ggplot2', repos = 'https://cran.rstudio.com', dependencies = TRUE)"
-  - rvm default
-  - gem install json kramdown jekyll
+  - sudo apt-get install libgit2-dev libudunits2-dev
+  - sudo apt-get install python3-setuptools python3-pip
+  - rvm install 2.5.3
+  - rvm 2.5.3 do ruby -S gem install bundle
+  - R -q -e 'install.packages(c("remotes", "curl"))'
+  - R -q -e 'remotes::install_github("hadley/requirements")'
 install:
-  - pip install pyyaml
+  - sudo -H pip3 install pyyaml
 script:
+  - bundle install
   - make lesson-check-all
   - make --always-make site
+
+
+# Header
+language: r
+sudo: false
+cache: packages
+latex: false
+
+#env
+env:
+  global:
+  - _R_CHECK_FORCE_SUGGESTS_=false
+  #- MAKEFLAGS="-j 2"
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000000000000000000000000000000000000..8c81b252930ee12d6ae86d084dd17973b061fd15
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,3 @@
+
+source 'https://rubygems.org'
+gem 'github-pages', group: :jekyll_plugins
diff --git a/Makefile b/Makefile
index ac587b879e52e3fb22134f0b9786c1188f207bd9..1cbaa777f796beb9746eebe255de28a74bd2d689 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 
 # Settings
 MAKEFILES=Makefile $(wildcard *.mk)
-JEKYLL=jekyll
+JEKYLL=bundle exec jekyll
 JEKYLL_VERSION=3.7.3
 PARSER=bin/markdown_ast.rb
 DST=_site