diff --git a/CMakeLists.txt b/CMakeLists.txt
index d590f16f..bed20628 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,7 @@ cmake_minimum_required (VERSION 3.5)
 cmake_policy(SET CMP0025 NEW)
 cmake_policy(SET CMP0042 NEW)
 cmake_policy(SET CMP0054 NEW)
+cmake_policy(SET CMP0091 NEW)
 
 project (yubihsm-shell)
 
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index b4264914..79d82944 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -14,8 +14,11 @@
 # limitations under the License.
 #
 
-include(${CMAKE_SOURCE_DIR}/cmake/openssl.cmake)
-find_libcrypto()
+if(${WIN32_BCRYPT})
+else(${WIN32_BCRYPT})
+  include(${CMAKE_SOURCE_DIR}/cmake/openssl.cmake)
+  find_libcrypto()
+endif(${WIN32_BCRYPT})
 
 if(MSVC)
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
@@ -29,7 +32,6 @@ set (
   ${CMAKE_CURRENT_SOURCE_DIR}/../common/pkcs5.c
   ${CMAKE_CURRENT_SOURCE_DIR}/../common/rand.c
   ${CMAKE_CURRENT_SOURCE_DIR}/../common/ecdh.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/../common/openssl-compat.c
   error.c
   lib_util.c
   yubihsm.c
@@ -40,6 +42,11 @@ if(MSVC)
 endif(MSVC)
 set(STATIC_SOURCE ${SOURCE})
 
+if(NOT ${WIN32_BCRYPT})
+  set(SOURCE ${SOURCE} ${CMAKE_CURRENT_SOURCE_DIR}/../common/openssl-compat.c)
+endif(NOT ${WIN32_BCRYPT})
+set (STATIC_SOURCE ${SOURCE})
+
 if(WIN32)
   set(ADDITIONAL_LIBRARY ws2_32)
   set (
@@ -117,6 +124,9 @@ if (ENABLE_STATIC)
   add_library (yubihsm_static STATIC ${STATIC_SOURCE})
   set_target_properties (yubihsm_static PROPERTIES POSITION_INDEPENDENT_CODE on OUTPUT_NAME yubihsm)
   set_target_properties (yubihsm_static PROPERTIES COMPILE_FLAGS "-DSTATIC " )
+  if(MSVC)
+    set_property(TARGET yubihsm_static PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+  endif(MSVC)
   add_coverage (yubihsm_static)
 endif()
 
diff --git a/lib/yubihsm.c b/lib/yubihsm.c
index 3ae4bbae..1ce641ca 100644
--- a/lib/yubihsm.c
+++ b/lib/yubihsm.c
@@ -4627,8 +4627,9 @@ yh_rc yh_init(void) {
 
 #ifdef STATIC
 static yh_rc load_backend(const char *name,
-                          void **backend __attribute__((unused)),
+                          void **backend,
                           struct backend_functions **bf) {
+  (void)backend;
   if (name == NULL) {
     DBG_ERR("No name given to load_backend");
     return YHR_GENERIC_ERROR;