diff --git a/CMakeLists.txt b/CMakeLists.txt
index f43940d271f387b3e823f737be952bbc90066519..906b598beae5c56bf62e913f3be8211654fb0f8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.16)
 
-project(jami-daemon
+project(jami
     VERSION 13.7.0
     LANGUAGES C CXX)
 set(PACKAGE_NAME "Jami Daemon")
@@ -241,6 +241,13 @@ elseif(MSVC)
 endif()
 
 add_library(${PROJECT_NAME} STATIC ${ALL_FILES})
+
+# Add the lib prefix to the output name for MSVC.
+if (MSVC)
+    set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
+    set(CMAKE_STATIC_LIBRARY_PREFIX "lib")
+endif()
+
 set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "daemon")
 set_target_properties (${PROJECT_NAME} PROPERTIES CXX_STANDARD 17)
 target_compile_definitions(${PROJECT_NAME} PRIVATE
diff --git a/compat/msvc/package.json b/compat/msvc/package.json
index 2f7bc1fd2661e0e4b506f9f637a37d5deee0e971..6f85d2f1e0acdcf97f914226f2bc1d7cbde607b0 100644
--- a/compat/msvc/package.json
+++ b/compat/msvc/package.json
@@ -16,5 +16,5 @@
         "libgit2"
     ],
     "configuration": "ReleaseLib_win32",
-    "project_paths": ["jami-daemon.vcxproj"]
+    "use_cmake": true
 }
diff --git a/compat/msvc/winmake.py b/compat/msvc/winmake.py
index 7d79f2a1e12ba100b4d5cc6ae54198b8d058c9c9..66b5523b37179ecf439155551f338e2eee11a38a 100644
--- a/compat/msvc/winmake.py
+++ b/compat/msvc/winmake.py
@@ -49,7 +49,6 @@ log = None
 # project paths
 daemon_msvc_dir = os.path.dirname(os.path.realpath(__file__))
 daemon_dir = os.path.dirname(os.path.dirname(daemon_msvc_dir))
-daemon_build_dir = daemon_dir + r'\build'
 contrib_src_dir = daemon_dir + r'\contrib\src'
 contrib_build_dir = daemon_dir + r'\contrib\build'
 contrib_tmp_dir = daemon_dir + r'\contrib\tarballs'
@@ -244,13 +243,14 @@ def make_daemon(pkg_info, force, sdk_version, toolset):
     env_set = 'false' if pkg_info.get('with_env', '') == '' else 'true'
     sdk_to_use = sdk_version if env_set == 'false' else pkg_info.get(
         'with_env', '')
-    build('daemon', daemon_build_dir,
+    build('daemon', daemon_dir,
           pkg_info.get('project_paths', []),
           pkg_info.get('custom_scripts', {}),
           env_set,
           sdk_to_use,
           toolset,
-          conf=pkg_info.get('configuration', 'Release'))
+          conf=pkg_info.get('configuration', 'Release'),
+          use_cmake=pkg_info.get('use_cmake', False))
 
 
 def make(pkg_info, force, sdk_version, toolset, isPlugin):