diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c5f432164..7ba4d839f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,13 +1,13 @@
 setup_qt()
 
-add_subdirectory( libtomahawk )
-
 include_directories( ${CMAKE_CURRENT_BINARY_DIR}/libtomahawk )
 include_directories( ${CMAKE_CURRENT_LIST_DIR}/libtomahawk )
 
-add_subdirectory( tomahawk )
+file(GLOB SUBDIRECTORIES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*")
 
-add_subdirectory( breakpad/CrashReporter/ )
-
-add_subdirectory( accounts )
-add_subdirectory( infoplugins )
\ No newline at end of file
+foreach(SUBDIRECTORY ${SUBDIRECTORIES})
+    if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}" AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}/CMakeLists.txt")
+        message(STATUS "build: " ${SUBDIRECTORY})
+        add_subdirectory( ${SUBDIRECTORY} )
+    endif()
+endforeach()
diff --git a/src/infoplugins/CMakeLists.txt b/src/infoplugins/CMakeLists.txt
index eadafe5a1..6906edeb2 100644
--- a/src/infoplugins/CMakeLists.txt
+++ b/src/infoplugins/CMakeLists.txt
@@ -1,3 +1,5 @@
+include( ${CMAKE_CURRENT_LIST_DIR}/../../TomahawkAddPlugin.cmake )
+
 add_subdirectory( generic )
 
 if(UNIX AND NOT APPLE)