diff --git a/.travis.yml b/.travis.yml
index 4cb1da8..a431f1a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 sudo: required
-dist: trusty
+dist: xenial
 language: cpp
 compiler:
   - gcc
@@ -26,18 +26,15 @@ matrix:
     - env:
       - MXE_CPU=i686
       - PATH="/usr/lib/mxe/usr/bin/:$PATH"
-      addons:
-        apt:
-          sources:
-          - sourceline: 'deb http://pkg.mxe.cc/repos/apt/debian jessie main'
-            key_url: 'http://pkg.mxe.cc/repos/apt/conf/mxeapt.gpg'
-          packages:
-          - mxe-i686-w64-mingw32.shared-gcc
-          - mxe-i686-w64-mingw32.shared-sdl2
-          - mxe-i686-w64-mingw32.shared-glew
-          - mxe-i686-w64-mingw32.shared-pkgconf
       before_install:
-      - git clone --depth=1 --branch=master git://github.com/mupen64plus/mupen64plus-core.git deps/mupen64plus-core
+       - curl -sSL "https://mirror.mxe.cc/repos/apt/client-conf/mxeapt.gpg" | sudo -E apt-key add -
+       - echo "deb https://mirror.mxe.cc/repos/apt xenial main" | sudo tee -a /etc/apt/sources.list
+       - sudo apt-get update -qq
+       - sudo apt-get -y --allow-unauthenticated install mxe-i686-w64-mingw32.shared-gcc
+       - sudo apt-get -y --allow-unauthenticated install mxe-i686-w64-mingw32.shared-sdl2
+       - sudo apt-get -y --allow-unauthenticated install mxe-i686-w64-mingw32.shared-glew
+       - sudo apt-get -y --allow-unauthenticated install mxe-i686-w64-mingw32.shared-pkgconf
+       - git clone --depth=1 --branch=master git://github.com/mupen64plus/mupen64plus-core.git deps/mupen64plus-core
       script:
       - make UNAME=MINGW CROSS_COMPILE="${MXE_CPU}-w64-mingw32.shared-" CC="${MXE_CPU}-w64-mingw32.shared-gcc" CXX="${MXE_CPU}-w64-mingw32.shared-g++" HOST_CPU="${MXE_CPU}" SDL_CONFIG="${MXE_CPU}-w64-mingw32.shared-sdl2-config" -C projects/unix APIDIR="$(pwd)/deps/mupen64plus-core/src/api/"  V=1  clean && 
         make UNAME=MINGW CROSS_COMPILE="${MXE_CPU}-w64-mingw32.shared-" CC="${MXE_CPU}-w64-mingw32.shared-gcc" CXX="${MXE_CPU}-w64-mingw32.shared-g++" HOST_CPU="${MXE_CPU}" SDL_CONFIG="${MXE_CPU}-w64-mingw32.shared-sdl2-config" -C projects/unix APIDIR="$(pwd)/deps/mupen64plus-core/src/api/"  V=1 -j$(nproc) all
@@ -45,17 +42,14 @@ matrix:
     - env:
       - MXE_CPU=x86_64
       - PATH="/usr/lib/mxe/usr/bin/:$PATH"
-      addons:
-        apt:
-          sources:
-          - sourceline: 'deb http://pkg.mxe.cc/repos/apt/debian jessie main'
-            key_url: 'http://pkg.mxe.cc/repos/apt/conf/mxeapt.gpg'
-          packages:
-          - mxe-x86-64-w64-mingw32.shared-gcc
-          - mxe-x86-64-w64-mingw32.shared-sdl2
-          - mxe-x86-64-w64-mingw32.shared-glew
-          - mxe-i686-w64-mingw32.shared-pkgconf
       before_install:
+       - curl -sSL "https://mirror.mxe.cc/repos/apt/client-conf/mxeapt.gpg" | sudo -E apt-key add -
+       - echo "deb https://mirror.mxe.cc/repos/apt xenial main" | sudo tee -a /etc/apt/sources.list
+       - sudo apt-get update -qq
+       - sudo apt-get -y --allow-unauthenticated install mxe-x86-64-w64-mingw32.shared-gcc
+       - sudo apt-get -y --allow-unauthenticated install mxe-x86-64-w64-mingw32.shared-sdl2
+       - sudo apt-get -y --allow-unauthenticated install mxe-x86-64-w64-mingw32.shared-glew
+       - sudo apt-get -y --allow-unauthenticated install mxe-x86-64-w64-mingw32.shared-pkgconf
        - git clone --depth=1 --branch=master git://github.com/mupen64plus/mupen64plus-core.git deps/mupen64plus-core
       script:
       - make UNAME=MINGW CROSS_COMPILE="${MXE_CPU}-w64-mingw32.shared-" CC="${MXE_CPU}-w64-mingw32.shared-gcc" CXX="${MXE_CPU}-w64-mingw32.shared-g++" HOST_CPU="${MXE_CPU}" SDL_CONFIG="${MXE_CPU}-w64-mingw32.shared-sdl2-config" -C projects/unix APIDIR="$(pwd)/deps/mupen64plus-core/src/api/"  V=1  clean &&