diff --git a/backends/libircclient-qt/CMakeLists.txt b/backends/libircclient-qt/CMakeLists.txt
index 9ac78875..eed9a3ca 100644
--- a/backends/libircclient-qt/CMakeLists.txt
+++ b/backends/libircclient-qt/CMakeLists.txt
@@ -4,7 +4,7 @@ FILE(GLOB HEADERS *.h)
 QT4_WRAP_CPP(SRC ${HEADERS})
 ADD_EXECUTABLE(spectrum_libircclient-qt_backend ${SRC})
 
-target_link_libraries(spectrum_libircclient-qt_backend ${IRC_LIBRARY} ${QT_LIBRARIES} transport  -lpthread -lssl -lidn -lxml2)
+target_link_libraries(spectrum_libircclient-qt_backend ${IRC_LIBRARY} ${QT_LIBRARIES} transport)
 
 INSTALL(TARGETS spectrum_libircclient-qt_backend RUNTIME DESTINATION bin)
 
diff --git a/backends/libpurple/CMakeLists.txt b/backends/libpurple/CMakeLists.txt
index 7c653ff7..bab08739 100644
--- a/backends/libpurple/CMakeLists.txt
+++ b/backends/libpurple/CMakeLists.txt
@@ -3,7 +3,7 @@ FILE(GLOB SRC *.cpp)
 
 ADD_EXECUTABLE(spectrum_libpurple_backend ${SRC})
 
-target_link_libraries(spectrum_libpurple_backend ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${EVENT_LIBRARIES} transport  -lpthread -lssl -lidn -lxml2)
+target_link_libraries(spectrum_libpurple_backend ${PURPLE_LIBRARY} ${GLIB2_LIBRARIES} ${EVENT_LIBRARIES} transport)
 
 INSTALL(TARGETS spectrum_libpurple_backend RUNTIME DESTINATION bin)
 
diff --git a/cmake_modules/SwiftenConfig.cmake b/cmake_modules/SwiftenConfig.cmake
index 6a2567ee..05ab853e 100644
--- a/cmake_modules/SwiftenConfig.cmake
+++ b/cmake_modules/SwiftenConfig.cmake
@@ -2,18 +2,15 @@ FIND_LIBRARY(SWIFTEN_LIBRARY NAMES Swiften)
 FIND_PATH(SWIFTEN_INCLUDE_DIR NAMES "Swiften.h" PATH_SUFFIXES libSwiften Swiften )
 
 if( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR )
-# 	find_program(SWIFTEN_CONFIG_EXECUTABLE NAMES swiften-config DOC "swiften-config executable")
-# 	set( SWIFTEN_CFLAGS "" )
-# 	if (SWIFTEN_CONFIG_EXECUTABLE)
-# 		execute_process(
-# 			COMMAND swiften-config --libs
-# 			OUTPUT_VARIABLE SWIFTEN_LIBRARY)
-# 		execute_process(
-# 			COMMAND swiften-config --cflags
-# 			OUTPUT_VARIABLE SWIFTEN_CFLAGS)
-# 		string(REGEX REPLACE "[\r\n]"                  " " SWIFTEN_LIBRARY "${SWIFTEN_LIBRARY}")
-# 		string(REGEX REPLACE " +$"                     ""  SWIFTEN_LIBRARY "${SWIFTEN_LIBRARY}")
-# 	endif()
+	find_program(SWIFTEN_CONFIG_EXECUTABLE NAMES swiften-config DOC "swiften-config executable")
+	set( SWIFTEN_CFLAGS "" )
+	if (SWIFTEN_CONFIG_EXECUTABLE)
+		execute_process(
+			COMMAND swiften-config --libs
+			OUTPUT_VARIABLE SWIFTEN_LIBRARY)
+		string(REGEX REPLACE "[\r\n]"                  " " SWIFTEN_LIBRARY "${SWIFTEN_LIBRARY}")
+		string(REGEX REPLACE " +$"                     ""  SWIFTEN_LIBRARY "${SWIFTEN_LIBRARY}")
+	endif()
 
 	set( SWIFTEN_INCLUDE_DIR ${SWIFTEN_INCLUDE_DIR}/.. )
 	message( STATUS "Found libSwiften: ${SWIFTEN_LIBRARY}, ${SWIFTEN_INCLUDE_DIR}")
diff --git a/spectrum/src/CMakeLists.txt b/spectrum/src/CMakeLists.txt
index aad30ebc..4a3e6432 100644
--- a/spectrum/src/CMakeLists.txt
+++ b/spectrum/src/CMakeLists.txt
@@ -6,7 +6,7 @@ ADD_EXECUTABLE(spectrum2 ${SRC})
 ADD_DEPENDENCIES(spectrum2 libpurple_backend)
 ADD_DEPENDENCIES(spectrum2 libircclient-qt_backend)
 
-target_link_libraries(spectrum2 transport -lpthread -lssl -lidn -lxml2)
+target_link_libraries(spectrum2 transport)
 
 INSTALL(TARGETS spectrum2 RUNTIME DESTINATION bin)