diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4300dd..e546ea4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -240,7 +240,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "SunOS")
 	set(OPENSSL_LIBS ${OPENSSL_LIBS} nsl socket)
 endif()
 
-if(NOT (CMAKE_SYSTEM_NAME MATCHES "(Darwin|MINGW|CYGWIN)" OR MSVC))
+if(NOT (CMAKE_SYSTEM_NAME MATCHES "(Darwin|CYGWIN)"))
 	set(BUILD_SHARED true)
 endif()
 
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index e41ac58..d8453f3 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -754,8 +754,10 @@ if (BUILD_SHARED)
 	add_library(crypto-shared SHARED $<TARGET_OBJECTS:crypto-objects>)
 	if (WIN32)
 		target_link_libraries(crypto-shared crypto Ws2_32.lib)
+		set(CRYPTO_POSTFIX -${CRYPTO_MAJOR_VERSION})
 	endif()
-	set_target_properties(crypto-shared PROPERTIES OUTPUT_NAME crypto)
+	set_target_properties(crypto-shared PROPERTIES
+		OUTPUT_NAME crypto${CRYPTO_POSTFIX} ARCHIVE_OUTPUT_NAME crypto)
 	set_target_properties(crypto-shared PROPERTIES VERSION
 		${CRYPTO_VERSION} SOVERSION ${CRYPTO_MAJOR_VERSION})
 	install(TARGETS crypto crypto-shared DESTINATION lib)
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index 7f53e14..0aac799 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -54,8 +54,10 @@ if (BUILD_SHARED)
 	add_library(ssl-shared SHARED $<TARGET_OBJECTS:ssl-objects>)
 	if (WIN32)
 		target_link_libraries(ssl-shared crypto-shared Ws2_32.lib)
+		set(SSL_POSTFIX -${SSL_MAJOR_VERSION})
 	endif()
-	set_target_properties(ssl-shared PROPERTIES OUTPUT_NAME ssl)
+	set_target_properties(ssl-shared PROPERTIES
+		OUTPUT_NAME ssl${SSL_POSTFIX} ARCHIVE_OUTPUT_NAME ssl)
 	set_target_properties(ssl-shared PROPERTIES VERSION ${SSL_VERSION}
 		SOVERSION ${SSL_MAJOR_VERSION})
 	install(TARGETS ssl ssl-shared DESTINATION lib)
diff --git a/tls/CMakeLists.txt b/tls/CMakeLists.txt
index df5c790..54ae953 100644
--- a/tls/CMakeLists.txt
+++ b/tls/CMakeLists.txt
@@ -33,8 +33,10 @@ if (BUILD_SHARED)
 	add_library(tls-shared SHARED $<TARGET_OBJECTS:tls-objects>)
 	if (WIN32)
 		target_link_libraries(tls-shared ssl-shared crypto-shared Ws2_32.lib)
+		set(TLS_POSTFIX -${TLS_MAJOR_VERSION})
 	endif()
-	set_target_properties(tls-shared PROPERTIES OUTPUT_NAME tls)
+	set_target_properties(tls-shared PROPERTIES
+		OUTPUT_NAME tls${TLS_POSTFIX} ARCHIVE_OUTPUT_NAME tls)
 	set_target_properties(tls-shared PROPERTIES VERSION ${TLS_VERSION}
 		SOVERSION ${TLS_MAJOR_VERSION})
 	install(TARGETS tls tls-shared DESTINATION lib)