diff --git a/.gitmodules b/.gitmodules
index d1f7bea6d2c006fd76e8833d72ec61233648c6ef..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +0,0 @@
-[submodule "extras/scripts/pywinmake"]
-	path = extras/scripts/pywinmake
-	url = https://review.jami.net/pywinmake
-	branch = master
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd6310e72d486980a1a3f89e6e09d1fbd5938b66..b3969d14f5480ed8720bdd0d6cf1078b730d08f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -351,6 +351,8 @@ if(MSVC)
    # Target
    ################################################################################
    include("CMake/Utils.cmake")
+   # Only generate Release configuration
+   set(CMAKE_CONFIGURATION_TYPES "Release" CACHE STRING "Limited configurations" FORCE)
    use_props(${PROJECT_NAME} "${CMAKE_CONFIGURATION_TYPES}" "${DEFAULT_CXX_PROPS}")
 
    ################################################################################
@@ -361,7 +363,6 @@ if(MSVC)
 
    # Supress generation of ZERO_CHECK
    set(CMAKE_SUPPRESS_REGENERATION true)
-   set(ROOT_NAMESPACE ringdaemon)
 
    ################################################################################
    # Output directory
diff --git a/README.md b/README.md
index b6f1fe4d5aa58036c324607968773171e1511ebc..8e10f0418b943b42492a50be325b5573af3c2a7f 100644
--- a/README.md
+++ b/README.md
@@ -168,6 +168,26 @@ Or, use your favorite package manager to install the necessary tools
 (macports or brew):
 `automake pkg-config libtool gettext yasm`
 
+How to compile on Windows
+----
+
+First, obtain and install `pywinmake` which is used to build the dependencies.
+
+```bash
+git clone "https://review.jami.net/pywinmake"
+cd pywinmake
+python -m pip install .
+```
+
+The rest of the build process uses CMake.
+
+```bash
+mkdir build
+cd build
+cmake ..
+cmake --build . --config Release
+```
+
 # Compile the dependencies
 ```bash
 cd contrib
diff --git a/extras/scripts/pywinmake b/extras/scripts/pywinmake
deleted file mode 160000
index 1a4b65ddfa2f528a3680e27120bbb8510dba28d6..0000000000000000000000000000000000000000
--- a/extras/scripts/pywinmake
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1a4b65ddfa2f528a3680e27120bbb8510dba28d6