diff --git a/.travis.yml b/.travis.yml
index 9dd1b9e0f16981afb41bbbdf082fae2d7cbf638b..beb38d631014dd1a89516748c857a86a6c846a49 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,34 +1,31 @@
+dist: trusty
+sudo: required
 language: c
 compiler:
   - gcc
   - clang
 env:
-  - BINDINGS=none
+  global:
+    - LLVM_CONFIG=llvm-config-3.8
+  matrix:
+    - BINDINGS=none
 matrix:
   include:
     - compiler: gcc
       language: ruby
-      rvm: ruby-1.9.3-p484
+      rvm: ruby-2.2.5
       env: BINDINGS=ruby
     - compiler: clang
       language: ruby
-      rvm: ruby-1.9.3-p484
+      rvm: ruby-2.2.5
       env: BINDINGS=ruby CC=clang
     - compiler: gcc
       language: ruby
-      rvm: ruby-2.0.0-p353
+      rvm: ruby-2.3.1
       env: BINDINGS=ruby
     - compiler: clang
       language: ruby
-      rvm: ruby-2.0.0-p353
-      env: BINDINGS=ruby CC=clang
-    - compiler: gcc
-      language: ruby
-      rvm: ruby-2.1.0
-      env: BINDINGS=ruby
-    - compiler: clang
-      language: ruby
-      rvm: ruby-2.1.0
+      rvm: ruby-2.3.1
       env: BINDINGS=ruby CC=clang
     - compiler: gcc
       language: python
@@ -92,11 +89,12 @@ matrix:
       env: BINDINGS=cpp CC=clang
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install llvm-3.8
   - sudo apt-get install lcov
   - gem install coveralls-lcov
+  - if [ "$CC" == "gcc" ]; then sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y; sudo apt-get update -qq; sudo apt-get install gcc-5; fi
+  - sudo apt-get install llvm-3.8 llvm-3.8-dev clang-3.8
   - if [ "$BINDINGS" != "none" ]; then sudo apt-get install -qq swig; fi
-  - if [ "$BINDINGS" == "perl" ]; then sudo add-apt-repository ppa:dns/irc -y; sudo apt-get update -qq; sudo apt-get install -qq swig=2.0.8-1irc1~12.04; fi
+  - if [ "$BINDINGS" == "perl" ]; then sudo apt-get install -t trusty-backports swig3.0; fi
   - if [ "$BINDINGS" == "python" ]; then sudo apt-get install -qq python-dev; fi
   - if [ "$BINDINGS" == "dotnet" ]; then sudo add-apt-repository ppa:directhex/monoxide -y; sudo apt-get update -qq; sudo apt-get install -qq mono-devel mono-mcs nunit nunit-console; mozroots --import --sync; fi
 install: true