diff --git a/src/accounts/CMakeLists.txt b/src/accounts/CMakeLists.txt
index be884d969..60e1916b6 100644
--- a/src/accounts/CMakeLists.txt
+++ b/src/accounts/CMakeLists.txt
@@ -1,11 +1,19 @@
 include(TomahawkAddPlugin)
 
-IF( JREEN_FOUND )
-    add_subdirectory( xmpp )
-ENDIF()
-
-# IF( QTWEETLIB_FOUND AND BUILD_GUI )
-#     ADD_SUBDIRECTORY( twitter )
-# ENDIF()
-#
-ADD_SUBDIRECTORY( zeroconf )
+file(GLOB SUBDIRECTORIES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*")
+foreach( SUBDIRECTORY ${SUBDIRECTORIES})
+  if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIRECTORY}")
+    message(STATUS "Building account ${SUBDIRECTORY}")
+    if(SUBDIRECTORY STREQUAL "xmpp")
+        if( JREEN_FOUND )
+            add_subdirectory( xmpp )
+        endif()
+    elseif(SUBDIRECTORY STREQUAL "twitter")
+        if(QTWEETLIB_FOUND AND BUILD_GUI)
+#             add_subdirectory( twitter )
+        endif()
+    else()
+        add_subdirectory( ${SUBDIRECTORY} )
+    endif()
+  endif()
+endforeach()