diff --git a/evmjit/CMakeLists.txt b/evmjit/CMakeLists.txt
index 5b34acdf8..ca73c5150 100644
--- a/evmjit/CMakeLists.txt
+++ b/evmjit/CMakeLists.txt
@@ -27,12 +27,25 @@ endif()
 # LLVM
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT LLVM_DIR)
 	# Workaround for Ubuntu broken LLVM package
-	message(STATUS "Using llvm-3.7-dev package from Ubuntu. If does not work, build LLVM and set -DLLVM_DIR=llvm-build/share/llvm/cmake")
-	execute_process(COMMAND llvm-config-3.7 --includedir OUTPUT_VARIABLE LLVM_INCLUDE_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE)
+	find_program(LLVM3_7_CONFIG llvm-config-3.7)
+	find_program(LLVM3_8_CONFIG llvm-config-3.8)
+	if (LLVM3_7_CONFIG)
+		message(STATUS "Using llvm-3.7-dev package from Ubuntu. If does not work, build LLVM and set -DLLVM_DIR=llvm-build/share/llvm/cmake")
+		set(LLVM_CONFIG_EXEC llvm-config-3.7)
+		set(LLVM_LIB_DIR /usr/lib/llvm-3.7/lib)
+	elseif(LLVM3_8_CONFIG)
+			message(STATUS "Using llvm-3.8-dev package from Ubuntu. If does not work, build LLVM and set -DLLVM_DIR=llvm-build/share/llvm/cmake")
+		set(LLVM_CONFIG_EXEC llvm-config-3.8)
+		set(LLVM_LIB_DIR /usr/lib/llvm-3.8/lib)
+	else()
+		message(FATAL_ERROR "No LLVM package found!")
+	endif()
+
+	execute_process(COMMAND ${LLVM_CONFIG_EXEC} --includedir OUTPUT_VARIABLE LLVM_INCLUDE_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE)
 	message(STATUS "LLVM include dirs: ${LLVM_INCLUDE_DIRS}")
 	set(LLVM_LIBS "-lLLVMipo -lLLVMVectorize -lLLVMX86AsmParser -lLLVMX86CodeGen -lLLVMX86Desc -lLLVMX86Info -lLLVMMCDisassembler -lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMCodeGen -lLLVMScalarOpts -lLLVMProfileData -lLLVMInstCombine -lLLVMInstrumentation -lLLVMTransformUtils -lLLVMipa -lLLVMMCJIT -lLLVMExecutionEngine -lLLVMTarget -lLLVMAnalysis -lLLVMRuntimeDyld -lLLVMObject -lLLVMMCParser -lLLVMBitReader -lLLVMMC -lLLVMCore -lLLVMSupport -lz -lpthread -lffi -ltinfo -ldl -lm")
 	set(LLVM_DEFINITIONS "-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS")
-	link_directories(/usr/lib/llvm-3.7/lib)
+	link_directories(${LLVM_LIB_DIR})
 else()
 	find_package(LLVM REQUIRED CONFIG)
 	if (${LLVM_VERSION} VERSION_LESS 3.7)