diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 0339e7d..0e2adaa 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -456,7 +456,7 @@
 
 SET_TARGET_PROPERTIES(crypto PROPERTIES LINKER_LANGUAGE C)
 
-if(NOT MSVC AND NOT ANDROID)
+if(NOT WIN32 AND NOT ANDROID)
   target_link_libraries(crypto pthread)
 endif()
 
diff --git a/tool/CMakeLists.txt b/tool/CMakeLists.txt
index 7658713..e9e387b 100644
--- a/tool/CMakeLists.txt
+++ b/tool/CMakeLists.txt
@@ -23,6 +23,10 @@
 
 add_dependencies(bssl global_target)
 
+if(WIN32)
+  target_link_libraries(bssl ws2_32)
+endif()
+
 if(APPLE OR WIN32 OR ANDROID)
   target_link_libraries(bssl ssl crypto)
 else()
diff --git a/util/generate_build_files.py b/util/generate_build_files.py
index 623e7d3..6c3977d 100644
--- a/util/generate_build_files.py
+++ b/util/generate_build_files.py
@@ -608,10 +608,14 @@
       self.PrintExe(cmake, 'bssl', files['tool'], ['ssl', 'crypto'])
 
       cmake.write(
-R'''if(NOT MSVC AND NOT ANDROID)
+R'''if(NOT WIN32 AND NOT ANDROID)
   target_link_libraries(crypto pthread)
 endif()
 
+if(WIN32)
+  target_link_libraries(bssl ws2_32)
+endif()
+
 ''')
 
 def FindCMakeFiles(directory):