diff --git a/CMakeLists.txt b/CMakeLists.txt
index df33ca0e8..db5ddb864 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,6 +112,13 @@ include(EthExecutableHelper)
 
 createBuildInfo()
 
+if (EVMJIT)
+	# Workaround for Ubuntu broken LLVM package
+	link_directories(/usr/lib/llvm-3.5/lib)
+	
+	add_subdirectory(evmjit)
+endif()
+
 add_subdirectory(libdevcore)
 add_subdirectory(libevmcore)
 add_subdirectory(liblll)
@@ -156,10 +163,6 @@ if (NOT HEADLESS)
 	
 endif()
 
-if (EVMJIT)
-	add_subdirectory(evmjit)
-endif()
-
 enable_testing()
 add_test(NAME alltests WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/test COMMAND testeth)
 
diff --git a/evmjit b/evmjit
index ed63ced24..1b490244b 160000
--- a/evmjit
+++ b/evmjit
@@ -1 +1 @@
-Subproject commit ed63ced24456c28b6dba345b8fc61e680ed406d7
+Subproject commit 1b490244bf4864b96448d56a7cd20f3d5b0a0b9b