diff --git a/.travis.yml b/.travis.yml
index 8bc50d4975..c6c3693097 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,9 @@
 # Use 'generic' to be able to override CC/CXX for clang
 language: generic
 
+# Use a release with a longer normal LTS
+dist: xenial
+
 matrix:
   include:
     - compiler: mingw-x86
@@ -64,14 +67,11 @@ before_install:
        sudo apt-get install -y g++-8
      elif [ "$CC" = clang-6.0 ]; then
        # Install a more recent clang than the default
-       sudo apt-get install -y libstdc++-7-dev
        sudo apt-get install -y clang-6.0
      elif [ "$CROSS_COMPILE" = i686-w64-mingw32- ]; then
-       sudo apt-get install -y g++-mingw-w64-i686
-       sudo apt-get install -y mingw-w64-i686-dev
+       sudo update-alternatives --set i686-w64-mingw32-g++ /usr/bin/i686-w64-mingw32-g++-posix
      elif [ "$CROSS_COMPILE" = x86_64-w64-mingw32- ]; then
-       sudo apt-get install -y g++-mingw-w64-x86-64
-       sudo apt-get install -y mingw-w64-x86-64-dev
+       sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
      fi
 
 script:
@@ -115,7 +115,7 @@ addons:
       - qtdeclarative5-dev
     sources:
       - ubuntu-toolchain-r-test
-      - llvm-toolchain-trusty-6.0
+      - llvm-toolchain-xenial
   coverity_scan:
     project:
       name: "RetroArch"