diff --git a/.gitmodules b/.gitmodules
index 176f1d0..6af035f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "thirdparty/sqlite"]
 	path = thirdparty/sqlite
 	url = git://github.com/janvidar/sqlite.git
+[submodule "thirdparty/openssl"]
+	path = thirdparty/openssl
+	url = https://github.com/openssl/openssl
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91fd544..5cada50 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,13 +121,6 @@ add_library(mod_topic MODULE ${PROJECT_SOURCE_DIR}/plugins/mod_topic.c)
 add_library(mod_no_guest_downloads MODULE ${PROJECT_SOURCE_DIR}/plugins/mod_no_guest_downloads.c)
 add_library(mod_auth_sqlite MODULE ${PROJECT_SOURCE_DIR}/plugins/mod_auth_sqlite.c)
 
-if(WIN32)
-	target_link_libraries(uhub ws2_32)
-	target_link_libraries(autotest-bin ws2_32)
-	target_link_libraries(mod_logging ws2_32)
-	target_link_libraries(mod_welcome ws2_32)
-endif()
-
 set_target_properties(
 	mod_example
 	mod_welcome
@@ -145,6 +138,7 @@ target_link_libraries(uhub ${CMAKE_DL_LIBS} adc network utils)
 target_link_libraries(uhub-passwd ${SQLITE3_LIBRARIES} utils)
 target_link_libraries(autotest-bin ${CMAKE_DL_LIBS} adc network utils)
 target_link_libraries(mod_example utils)
+target_link_libraries(mod_welcome network)
 target_link_libraries(mod_welcome utils)
 target_link_libraries(mod_auth_simple utils)
 target_link_libraries(mod_auth_sqlite ${SQLITE3_LIBRARIES} utils)
@@ -152,12 +146,18 @@ target_link_libraries(mod_chat_history utils)
 target_link_libraries(mod_chat_history_sqlite ${SQLITE3_LIBRARIES} utils)
 target_link_libraries(mod_no_guest_downloads utils)
 target_link_libraries(mod_chat_only utils)
+target_link_libraries(mod_logging network)
 target_link_libraries(mod_logging utils)
 target_link_libraries(mod_topic utils)
 target_link_libraries(utils network)
-target_link_libraries(mod_welcome network)
-target_link_libraries(mod_logging network)
 
+if(WIN32)
+	find_library(WS2_32_LIBRARY ws2_32)
+	target_link_libraries(uhub ${WS2_32_LIBRARY})
+	target_link_libraries(autotest-bin ${WS2_32_LIBRARY})
+	target_link_libraries(mod_logging ${WS2_32_LIBRARY})
+	target_link_libraries(mod_welcome ${WS2_32_LIBRARY})
+endif()
 
 if(UNIX)
 	add_library(adcclient STATIC ${adcclient_SOURCES})
diff --git a/thirdparty/openssl b/thirdparty/openssl
new file mode 160000
index 0000000..5707219
--- /dev/null
+++ b/thirdparty/openssl
@@ -0,0 +1 @@
+Subproject commit 5707219a6aae8052cb98aa361d115be01b8fd894
diff --git a/toolchain-mingw64.cmake b/toolchain-mingw64.cmake
new file mode 100644
index 0000000..126e40c
--- /dev/null
+++ b/toolchain-mingw64.cmake
@@ -0,0 +1,19 @@
+# the name of the target operating system
+SET(CMAKE_SYSTEM_NAME Windows)
+
+SET(COMPILER_PREFIX "x86_64-w64-mingw32")
+
+# which compilers to use for C and C++
+SET(CMAKE_C_COMPILER ${COMPILER_PREFIX}-gcc)
+SET(CMAKE_CXX_COMPILER ${COMPILER_PREFIX}-g++)
+SET(CMAKE_RC_COMPILER ${COMPILER_PREFIX}-windres)
+
+# here is the target environment located
+SET(CMAKE_FIND_ROOT_PATH  /usr/${COMPILER_PREFIX})
+
+# adjust the default behaviour of the FIND_XXX() commands:
+# search headers and libraries in the target environment, search
+# programs in the host environment
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)