diff --git a/backends/CMakeLists.txt b/backends/CMakeLists.txt
index cdb2696f9a0bebb27311486ef609d4a36feefa2a..5b940225cfff331b46b325bd40a10897fb1fa19a 100644
--- a/backends/CMakeLists.txt
+++ b/backends/CMakeLists.txt
@@ -10,6 +10,8 @@ if (PROTOBUF_FOUND)
 	ADD_SUBDIRECTORY(smstools3)
 
 	ADD_SUBDIRECTORY(template)
+	
+	ADD_SUBDIRECTORY(twitter)
 
 if (NOT WIN32)
 	ADD_SUBDIRECTORY(frotz)
diff --git a/backends/twitter/CMakeLists.txt b/backends/twitter/CMakeLists.txt
index 1df4651ed42be60e5726db3c1f67a0e8e06906c5..d3663f490d8e403b0a9829b241982261d367689b 100644
--- a/backends/twitter/CMakeLists.txt
+++ b/backends/twitter/CMakeLists.txt
@@ -1,4 +1,4 @@
 include_directories (${libtransport_SOURCE_DIR}/backends/twitter/libtwitcurl) 
-link_directories (${libtransport_BIN_DIR}/backends/twitter/libtwitcurl) 
-add_executable(spectrum_twitter_backend main.cpp)
-target_link_libraries(spectrum_twitter_backend twitcurl curl)
+FILE(GLOB SRC *.cpp libtwitcurl/*.cpp)
+add_executable(spectrum_twitter_backend ${SRC})
+target_link_libraries(spectrum_twitter_backend curl)