diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10b83aadb..18566bc72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,8 +32,6 @@ add_subdirectory(solc)
 if (NOT EMSCRIPTEN)
 	add_subdirectory(liblll)
 	add_subdirectory(test)
-endif()
-if (ETHASHCL)
 	add_subdirectory(lllc)
 endif()
 
diff --git a/liblll/CMakeLists.txt b/liblll/CMakeLists.txt
index 734f6901d..97a1a1861 100644
--- a/liblll/CMakeLists.txt
+++ b/liblll/CMakeLists.txt
@@ -15,7 +15,7 @@ file(GLOB HEADERS "*.h")
 include_directories(BEFORE ..)
 add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
-eth_use(${EXECUTABLE} REQUIRED Eth::evmasm)
+eth_use(${EXECUTABLE} REQUIRED Solidity::evmasm)
 #target_link_libraries(${EXECUTABLE} evmasm)
 
 install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
index fa2f4e9cc..ab9ee1e2e 100644
--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@@ -14,7 +14,7 @@ file(GLOB HEADERS "*/*.h")
 include_directories(BEFORE ..)
 add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
-eth_use(${EXECUTABLE} REQUIRED Dev::devcore Eth::evmcore Eth::evmasm)
+eth_use(${EXECUTABLE} REQUIRED Dev::devcore Eth::evmcore Solidity::evmasm)
 
 install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib )
 install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )
diff --git a/lllc/CMakeLists.txt b/lllc/CMakeLists.txt
index a94324322..989b8cbf3 100644
--- a/lllc/CMakeLists.txt
+++ b/lllc/CMakeLists.txt
@@ -6,7 +6,7 @@ file(GLOB HEADERS "*.h")
 include_directories(BEFORE ..)
 add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 
-eth_use(${EXECUTABLE} REQUIRED Eth::lll Dev::buildinfo)
+eth_use(${EXECUTABLE} REQUIRED Solidity::lll Dev::buildinfo)
 
 install( TARGETS ${EXECUTABLE} DESTINATION bin )