diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d5006d29..dda5f1985 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,7 +131,7 @@ find_package(YAJL)
 if(NOT YAJL_FOUND)
   include_directories(${icinga2_BINARY_DIR}/third-party/yajl/include)
   link_directories(${icinga2_BINARY_DIR}/third-party/yajl)
-  list(APPEND base_SOURCES $<TARGET_OBJECTS:yajl>)
+  list(APPEND base_OBJS $<TARGET_OBJECTS:yajl>)
 else()
   list(APPEND base_DEPS ${YAJL_LIBRARIES})
 endif()
diff --git a/icinga-app/CMakeLists.txt b/icinga-app/CMakeLists.txt
index cc209ed75..69286bdeb 100644
--- a/icinga-app/CMakeLists.txt
+++ b/icinga-app/CMakeLists.txt
@@ -65,9 +65,7 @@ endif()
 
 add_executable(icinga-app
   $<TARGET_OBJECTS:icingaloader>
-  $<TARGET_OBJECTS:mmatch>
-  $<TARGET_OBJECTS:socketpair>
-  $<TARGET_OBJECTS:base>
+  ${base_OBJS}
   $<TARGET_OBJECTS:config>
   $<TARGET_OBJECTS:remote>
   $<TARGET_OBJECTS:cli>