diff --git a/.travis.yml b/.travis.yml
index f02af49..5932ead 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,16 +7,21 @@ before_install:
     # Upgrade gcc
     - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
     - sudo apt-get -qq update
-    - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8; fi
-    - if [ "$CXX" = "g++" ]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 98; fi
     
-    # Upgrade clang
-    - sudo apt-get -qq install llvm-3.4 llvm-3.4-dev
-    - if [ "$CXX" = "clang++" ]; then export CXXFLAGS="$CXXFLAGS -stdlib=libc++"; fi
+    - if [ "$CXX" == "g++" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
+    - if [ "$CXX" == "clang++" ]; then sudo add-apt-repository -y ppa:h-rayflood/llvm; fi
     
     # Install dependencies
     - sudo apt-get -qq install libwxgtk3.0-dev libwxgtk3.0-0 libssh2-1-dev
 
+install:
+    - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8; fi
+    - if [ "$CXX" = "g++" ]; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 98; fi
+    
+    #clang
+    - if [ "$CXX" == "clang++" ]; then sudo apt-get install --allow-unauthenticated -qq clang-3.4; fi
+    - if [ "$CXX" == "clang++" ]; then export CXX="clang++-3.4"; fi
+
 # Build with both gcc and clang
 compiler:
     - gcc