diff --git a/.travis.yml b/.travis.yml
index 952b33741f..38ff0f05c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,6 +45,12 @@ install:
       brew update;
       brew install ccache glew;
     fi;
+  # Download pre-compiled LLVM libs
+  -  if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+        wget https://github.com/RPCS3/llvm/releases/download/continuous-linux-release_60/llvmlibs-linux.tar.gz;
+        mkdir llvmlibs;
+        tar -xzf ./llvmlibs-linux.tar.gz -C llvmlibs;
+     fi;
 
 before_script:
   - git submodule update --init asmjit 3rdparty/ffmpeg 3rdparty/pugixml 3rdparty/GSL 3rdparty/libpng Utilities/yaml-cpp 3rdparty/cereal 3rdparty/hidapi 3rdparty/Optional 3rdparty/xxHash Vulkan/glslang Vulkan/Vulkan-LoaderAndValidationLayers
@@ -55,7 +61,7 @@ before_script:
     else
       export CXXFLAGS="$CXXFLAGS -DBRANCH=$TRAVIS_REPO_SLUG/$TRAVIS_BRANCH/#$TRAVIS_PULL_REQUEST";
     fi;
-  - cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DUSE_NATIVE_INSTRUCTIONS=OFF -DWITHOUT_LLVM=ON -G Ninja;
+  - cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DLLVM_DIR=../llvmlibs/lib/cmake/llvm/ -DUSE_NATIVE_INSTRUCTIONS=OFF -G Ninja;
 
 script:
   - ninja -j 2
diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt
index 90e4a258d4..e8de36669c 100644
--- a/rpcs3/CMakeLists.txt
+++ b/rpcs3/CMakeLists.txt
@@ -185,7 +185,9 @@ set(CMAKE_MODULE_PATH "${RPCS3_SRC_DIR}/cmake_modules")
 find_package(OpenGL REQUIRED)
 find_package(OpenAL REQUIRED)
 if(NOT WITHOUT_LLVM)
-	find_package(LLVM 999.666 CONFIG)
+    if (EXISTS "${CMAKE_SOURCE_DIR}/llvmlibs")
+        find_package(LLVM 6.0 CONFIG)
+    endif()
 	if(NOT LLVM_FOUND)
 		message("LLVM will be built from the submodule.")