diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7b76671e6bdd5e3fc994c319dde2a2986b8024c..ec59679c1d4ae9309cd306bf00955098f7edea33 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,6 +48,7 @@ find_package(Swiften)
 if (CMAKE_COMPILER_IS_GNUCXX)
 set(openssl_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(openssl)
+endif()
 
 set(Boost_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 if (WIN32)
diff --git a/cmake_modules/CommuniConfig.cmake b/cmake_modules/CommuniConfig.cmake
index 436ad61e9ed23e78813253ee8855c8849ffcc75a..e2315310349f010ef93418ef113a7c5fb75d22b1 100644
--- a/cmake_modules/CommuniConfig.cmake
+++ b/cmake_modules/CommuniConfig.cmake
@@ -1,4 +1,4 @@
-find_package(Qt4 REQUIRED)
+find_package(Qt4)
 include( ${QT_USE_FILE} )
 
 FIND_LIBRARY(IRC_LIBRARY NAMES Communi PATHS ${QT_LIBRARY_DIR})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3fd237984d66a25e07b0b15f5486adbef37e3800..c3e301da2b07b2ab87eafa2835ec948073b7adf6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -44,11 +44,16 @@ if (CMAKE_COMPILER_IS_GNUCXX)
 	endif()
 endif()
 
-if (WIN32)
-	TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
-else (WIN32)
-	TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY})
-endif(WIN32)
+if (NOT CMAKE_COMPILER_IS_GNUCXX)
+	include_directories("${CMAKE_SOURCE_DIR}/msvc-deps/protobuf/libprotobuf")
+	TARGET_LINK_LIBRARIES(transport transport-plugin sqlite3 libprotobuf ${PQXX_LIBRARY} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES})
+else ()
+	if (WIN32)
+		TARGET_LINK_LIBRARIES(transport transport-plugin sqlite3 ${PQXX_LIBRARY} ${PQ_LIBRARY} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${LOG4CXX_LIBRARIES} ${PROTOBUF_LIBRARIES})
+	else()
+		TARGET_LINK_LIBRARIES(transport transport-plugin ${PQXX_LIBRARY} ${PQ_LIBRARY} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY})
+	endif()
+endif()
 
 SET_TARGET_PROPERTIES(transport PROPERTIES
       VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION}