diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba47cab9aa9af925d61798ed598731735d00e26b..3e4c4478bfe51155e1e6ba20f1beede4a3d6adef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,6 +105,11 @@ if(WIN32 AND SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR )
 	if (LIBXML_LIBRARY)
 		set(SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY} ${LIBXML_LIBRARY})
 	endif()
+	set(SWIFTEN_LIBRARY Dnsapi)
+	set(SWIFTEN_LIBRARY Crypt32)
+	set(SWIFTEN_LIBRARY Secur32)
+	set(SWIFTEN_LIBRARY Iphlpapi)
+	set(SWIFTEN_LIBRARY Winscard)
 	message(STATUS "Using swiften: ${SWIFTEN_INCLUDE_DIR} ${SWIFTEN_LIBRARY}")
 else()
 	set(Swiften_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
diff --git a/spectrum/src/CMakeLists.txt b/spectrum/src/CMakeLists.txt
index a3bee7f11734bb4541b6ea845c304010baff376a..2dd5b0da4293013aafc654631bc34e75c37ecf64 100644
--- a/spectrum/src/CMakeLists.txt
+++ b/spectrum/src/CMakeLists.txt
@@ -14,11 +14,7 @@ ADD_EXECUTABLE(spectrum2 ${SRC})
 ADD_DEPENDENCIES(spectrum2 spectrum2_libpurple_backend)
 ADD_DEPENDENCIES(spectrum2 spectrum2_libircclient-qt_backend)
 
-if (WIN32)
-target_link_libraries(spectrum2 transport ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY} Dnsapi Crypt32 Secur32 Iphlpapi Winscard)
-else()
 target_link_libraries(spectrum2 transport ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY})
-endif()
 
 INSTALL(TARGETS spectrum2 RUNTIME DESTINATION bin)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e46d7fc6f182bab3771409228d75134d2dc54e10..50a9ca9c9350b0d9678f94ec30976a39f17939b1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -45,9 +45,9 @@ if (CMAKE_COMPILER_IS_GNUCXX)
 endif()
 
 if (WIN32)
-	TARGET_LINK_LIBRARIES(transport transport-plugin sqlite3 ${PQXX_LIBRARY} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARIES} ${PROTOBUF_LIBRARY})
+	TARGET_LINK_LIBRARIES(transport transport-plugin sqlite3 ${PQXX_LIBRARY} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARY})
 else()
-	TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY})
+	TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY} ${PROTOBUF_LIBRARY})
 endif()
 
 SET_TARGET_PROPERTIES(transport PROPERTIES