diff --git a/CMakeLists.txt b/CMakeLists.txt
index c473bfaf8f73c9a06818a8935cc1f605d2ec21e9..c20f571b360f9232e1c5c27d7e1096f4e5b3fb9e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,8 +27,15 @@ find_package(event)
 set(Swiften_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(Swiften REQUIRED)
 
+find_package(openssl REQUIRED)
+
 set(Boost_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
-find_package(Boost COMPONENTS date_time system filesystem regex thread signals REQUIRED)
+if (WIN32)
+set(Boost_USE_STATIC_LIBS        ON)
+set(Boost_USE_MULTITHREADED      ON)
+set(Boost_USE_STATIC_RUNTIME    OFF)
+endif()
+find_package(Boost COMPONENTS program_options date_time system filesystem regex thread signals REQUIRED)
 message( STATUS "Found Boost: ${Boost_LIBRARIES}, ${Boost_INCLUDE_DIR}")
 
 set(Protobuf_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
@@ -118,10 +125,15 @@ else()
 	message(FATAL_ERROR "Logging           : no (install log4cxx-devel)")
 endif()
 
+if (WIN32)
+ADD_DEFINITIONS(-D_WIN32_WINNT=0x501)
+ADD_DEFINITIONS(-DWIN32_LEAN_AND_MEAN)
+endif()
+
 if(CMAKE_BUILD_TYPE MATCHES Debug)
+if (CMAKE_COMPILER_IS_GNUCXX)
 	ADD_DEFINITIONS(-O3)
 	ADD_DEFINITIONS(-ggdb)
-	ADD_DEFINITIONS(-DDEBUG)
 	ADD_DEFINITIONS(-Wall)
 	ADD_DEFINITIONS(-W)
 	ADD_DEFINITIONS(-Wcast-align)
@@ -133,6 +145,8 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)
 	ADD_DEFINITIONS(-Woverloaded-virtual)
 	ADD_DEFINITIONS(-Wsign-promo)
 	ADD_DEFINITIONS(-Wundef -Wunused)
+endif()
+	ADD_DEFINITIONS(-DDEBUG)
 	message("Debug             : yes")
 else(CMAKE_BUILD_TYPE MATCHES Debug)
 	message("Debug             : no (run \"cmake . -DCMAKE_BUILD_TYPE=Debug\")")
@@ -147,7 +161,7 @@ include_directories(include)
 include_directories(${EVENT_INCLUDE_DIRS})
 include_directories(${SWIFTEN_INCLUDE_DIR})
 include_directories(${Boost_INCLUDE_DIRS})
-
+include_directories(${OPENSSL_INCLUDE_DIR})
 
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(include)