diff --git a/.travis.yml b/.travis.yml
index a7e7dda131..0ecc8a39b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,17 +7,18 @@ matrix:
 #            - COMPILER="gcc"
 #          services: docker
 #          cache: ccache
-#          install: "docker pull rpcs3/rpcs3-travis-trusty:1.1"
-#          script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .travis/travis.env rpcs3/rpcs3-travis-trusty:1.1 /bin/bash -ex /rpcs3/.travis/build-linux.bash'
+#          install: "docker pull rpcs3/rpcs3-travis-xenial:1.0"
+#          script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .travis/travis.env rpcs3/rpcs3-travis-xenial:1.0 /bin/bash -ex /rpcs3/.travis/build-linux.bash'
         - os: linux
+          dist: xenial
           env:
             - NAME="Linux build"
             - COMPILER="clang"
             - DEPLOY_APPIMAGE="true"
           services: docker
           cache: ccache
-          install: "docker pull rpcs3/rpcs3-travis-trusty:1.1"
-          script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .travis/travis.env rpcs3/rpcs3-travis-trusty:1.1 /bin/bash -ex /rpcs3/.travis/build-linux.bash'
+          install: "docker pull rpcs3/rpcs3-travis-xenial:1.0"
+          script: 'travis_wait docker run -v $(pwd):/rpcs3 -v "$HOME/.ccache":/root/.ccache --env-file .travis/travis.env rpcs3/rpcs3-travis-xenial:1.0 /bin/bash -ex /rpcs3/.travis/build-linux.bash'
         - os: osx
           osx_image: xcode10.2
           addons:
diff --git a/.travis/deploy-linux.bash b/.travis/deploy-linux.bash
index d74ccc91dd..df59945306 100644
--- a/.travis/deploy-linux.bash
+++ b/.travis/deploy-linux.bash
@@ -13,7 +13,7 @@ if [ "$DEPLOY_APPIMAGE" = "true" ]; then
 	cp $(readlink -f /lib/x86_64-linux-gnu/libnsl.so.1) ./appdir/usr/lib/libnsl.so.1
 	export PATH=/rpcs3/build/squashfs-root/usr/bin/:${PATH}
 
-	# Embed newer libstdc++ for distros that don't come with it (ubuntu 14.04, 16.04)
+	# Embed newer libstdc++ for distros that don't come with it (ubuntu 16.04)
 	mkdir -p appdir/usr/optional/ ; mkdir -p appdir/usr/optional/libstdc++/
 	cp /usr/lib/x86_64-linux-gnu/libstdc++.so.6 ./appdir/usr/optional/libstdc++/
 	rm ./appdir/AppRun
diff --git a/rpcs3/Emu/CMakeLists.txt b/rpcs3/Emu/CMakeLists.txt
index 2b20181294..5b45c81aec 100644
--- a/rpcs3/Emu/CMakeLists.txt
+++ b/rpcs3/Emu/CMakeLists.txt
@@ -11,6 +11,11 @@ target_link_libraries(rpcs3_emu
 	PUBLIC
 		3rdparty::libevdev)
 
+
+find_package(Threads REQUIRED)
+target_link_libraries(rpcs3_emu
+	PUBLIC Threads::Threads)
+
 # For stdafx.h
 target_include_directories(rpcs3_emu
 	PUBLIC