diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d055587c..150fb865c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -157,6 +157,7 @@ if (NOT LANGUAGES)
 endif()
 
 if (EVMCC)
+  add_subdirectory(libevmjit)
   add_subdirectory(evmcc)
 endif()
 
diff --git a/evmcc/CMakeLists.txt b/evmcc/CMakeLists.txt
index f09c327b8..ae9162162 100644
--- a/evmcc/CMakeLists.txt
+++ b/evmcc/CMakeLists.txt
@@ -12,6 +12,7 @@ target_link_libraries(${EXECUTABLE} devcore)
 target_link_libraries(${EXECUTABLE} ethcore)
 target_link_libraries(${EXECUTABLE} evm)
 target_link_libraries(${EXECUTABLE} evmface)
+target_link_libraries(${EXECUTABLE} evmjit)
 
 if ("${TARGET_PLATFORM}" STREQUAL "w64")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++")
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 2e5366079..7dc226fb5 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -5,6 +5,8 @@ aux_source_directory(. SRC_LIST)
 include_directories(..)
 link_directories(../libethcore)
 link_directories(../libethereum)
+link_directories(../libevm)
+link_directories(../libevmjit)
 
 file(GLOB HEADERS "*.h")
 add_executable(testeth ${SRC_LIST} ${HEADERS})
@@ -14,6 +16,8 @@ target_link_libraries(testeth ethcore)
 target_link_libraries(testeth secp256k1)
 target_link_libraries(testeth gmp)
 target_link_libraries(testeth ${CRYPTOPP_LS})
+target_link_libraries(testeth evm)
+target_link_libraries(testeth evmjit)
 
 if ("${TARGET_PLATFORM}" STREQUAL "w64")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++")