diff --git a/src/python/recoll/00README_build-win b/src/python/recoll/00README_build-win
deleted file mode 100644
index 58364f3b..00000000
--- a/src/python/recoll/00README_build-win
+++ /dev/null
@@ -1 +0,0 @@
-/c/Program\ Files\ \(x86\)/Python37-32/python.exe setup-win.py bdist_wheel
diff --git a/src/windows/mkinstdir.sh b/src/windows/mkinstdir.sh
index 0d5c950b..1e84d92f 100644
--- a/src/windows/mkinstdir.sh
+++ b/src/windows/mkinstdir.sh
@@ -73,7 +73,8 @@ RCLIDX=$RCLW/build-recollindex-${QTA}/${qtsdir}/recollindex.exe
 RCLQ=$RCLW/build-recollq-${QTA}/${qtsdir}/recollq.exe
 RCLS=$RCLW/build-rclstartw-${QTA}/${qtsdir}/rclstartw.exe
     
-PYTHON=${RCLDEPS}py-python3
+#PYTHON=${RCLDEPS}py-python3
+PYTHON=${RCLDEPS}python-3.7.9-embed-win32
 UNRTF=${RCLDEPS}unrtf
 ANTIWORD=${RCLDEPS}antiword
 PYXSLT=${RCLDEPS}pyxslt
@@ -138,6 +139,9 @@ copyqt()
     fi
 }
 
+# Note that pychm and pyhwp are pre-copied into the py-python3 python
+# distribution directory. The latter also needs olefile and six (also
+# copied to the python tree
 copypython()
 {
     set -x
@@ -217,6 +221,7 @@ copymutagen()
     chkcp $MUTAGEN/build/lib/mutagen/mp3.py $FILTERS/mutagen
 }
 
+# Not used any more, the epub python code is bundled with recoll
 copyepub()
 {
     cp -rp $EPUB/build/lib/epub $FILTERS
@@ -235,12 +240,14 @@ copyfuture()
     chkcp $FUTURE/future/builtins/newsuper.pyc $FILTERS/future/builtins
 }
 
+# Replaced by mutagen
 copypyexiv2()
 {
     cp -rp $PYEXIV2/pyexiv2 $FILTERS
     chkcp $PYEXIV2/libexiv2python.pyd $FILTERS/
 }
 
+# Replaced by lxml for python3
 copypyxslt()
 {
     chkcp $PYXSLT/libxslt.py $FILTERS/
@@ -319,11 +326,17 @@ copyaspell()
 copypyrecoll()
 {
     if test $BUILD = MSVC ; then
-        PYRCLWHEEL=${PYRECOLL}/dist/Recoll-${VERSION}-cp37-cp37m-win32.whl
         DEST=${DESTDIR}/Share/dist
         test -d $DEST || mkdir $DEST || fatal cant create $DEST
         rm -f ${DEST}/*
-        chkcp ${PYRCLWHEEL} $DEST
+        for v in 37;do
+            PYRCLWHEEL=${PYRECOLL}/dist/Recoll-${VERSION}-cp${v}-cp${v}m-win32.whl
+            chkcp ${PYRCLWHEEL} $DEST
+        done
+        for v in 38 39;do
+            PYRCLWHEEL=${PYRECOLL}/dist/Recoll-${VERSION}-cp${v}-cp${v}-win32.whl
+            chkcp ${PYRCLWHEEL} $DEST
+        done
     fi
 }
 
@@ -349,21 +362,11 @@ copyrecoll
 copypyrecoll
 copyqt
 copyaspell
-copypyxslt
 copypoppler
 copyantiword
 copyunrtf
-# Copied into python3 and installed with it
-#copyfuture
 copymutagen
-# Switched to perl for lack of python3 version
-#copypyexiv2
 copywpd
-# Chm is now copied into the python tree, which is installed by copypython
-#copychm
 copypff
 
-# Note that pychm and pyhwp are pre-copied into the py-python3 python
-# distribution directory. The latter also needs olefile and six (also
-# copied)
 copypython
diff --git a/src/windows/python-recoll-ext-build.sh b/src/windows/python-recoll-ext-build.sh
new file mode 100644
index 00000000..a407e92f
--- /dev/null
+++ b/src/windows/python-recoll-ext-build.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+pythondirs="Python37-32 Python38-32 Python39-32"
+
+fatal()
+{
+    echo $*
+    exit 1
+}
+
+test -f ../python/recoll/pyrecoll.cpp || fatal must be run in src/windows
+
+cd ../python/recoll || exit 1
+
+test -f pyrecoll.cpp || fatal Not seeing pyrecoll.cpp
+
+rm -rf dist build || exit 1
+
+# Note that the wheel format is the preferred distribution format (vs
+# egg), but it requires installation of the wheel package, which does
+# not come with the base Python installation. E.g.:
+# /c/Program\ Files\ \(x86\)/Python38-32/python -m pip install wheel
+for p in $pythondirs; do
+    /c/Program\ Files\ \(x86\)/${p}/python.exe setup-win.py bdist_wheel
+done
+
+rm -rf build Recoll.egg-info
diff --git a/src/windows/SolutionSettings/SolutionSettings.props b/src/windows/visual/SolutionSettings/SolutionSettings.props
similarity index 100%
rename from src/windows/SolutionSettings/SolutionSettings.props
rename to src/windows/visual/SolutionSettings/SolutionSettings.props
diff --git a/src/windows/SolutionSettings/SolutionSettings.vcxproj b/src/windows/visual/SolutionSettings/SolutionSettings.vcxproj
similarity index 100%
rename from src/windows/SolutionSettings/SolutionSettings.vcxproj
rename to src/windows/visual/SolutionSettings/SolutionSettings.vcxproj
diff --git a/src/windows/SolutionSettings/SolutionSettings.vcxproj.filters b/src/windows/visual/SolutionSettings/SolutionSettings.vcxproj.filters
similarity index 100%
rename from src/windows/SolutionSettings/SolutionSettings.vcxproj.filters
rename to src/windows/visual/SolutionSettings/SolutionSettings.vcxproj.filters
diff --git a/src/windows/Win32ProjectRecoll.sln b/src/windows/visual/Win32ProjectRecoll.sln
similarity index 100%
rename from src/windows/Win32ProjectRecoll.sln
rename to src/windows/visual/Win32ProjectRecoll.sln
diff --git a/src/windows/Win32ProjectRecoll.vcxproj b/src/windows/visual/Win32ProjectRecoll.vcxproj
similarity index 100%
rename from src/windows/Win32ProjectRecoll.vcxproj
rename to src/windows/visual/Win32ProjectRecoll.vcxproj
diff --git a/src/windows/Win32ProjectRecoll.vcxproj.filters b/src/windows/visual/Win32ProjectRecoll.vcxproj.filters
similarity index 100%
rename from src/windows/Win32ProjectRecoll.vcxproj.filters
rename to src/windows/visual/Win32ProjectRecoll.vcxproj.filters
diff --git a/src/windows/Win32ProjectRecoll.vcxproj.user b/src/windows/visual/Win32ProjectRecoll.vcxproj.user
similarity index 100%
rename from src/windows/Win32ProjectRecoll.vcxproj.user
rename to src/windows/visual/Win32ProjectRecoll.vcxproj.user
diff --git a/src/windows/recollindex/recollindex.vcxproj b/src/windows/visual/recollindex/recollindex.vcxproj
similarity index 100%
rename from src/windows/recollindex/recollindex.vcxproj
rename to src/windows/visual/recollindex/recollindex.vcxproj
diff --git a/src/windows/recollindex/recollindex.vcxproj.filters b/src/windows/visual/recollindex/recollindex.vcxproj.filters
similarity index 100%
rename from src/windows/recollindex/recollindex.vcxproj.filters
rename to src/windows/visual/recollindex/recollindex.vcxproj.filters
diff --git a/src/windows/recollindex/recollindex.vcxproj.user b/src/windows/visual/recollindex/recollindex.vcxproj.user
similarity index 100%
rename from src/windows/recollindex/recollindex.vcxproj.user
rename to src/windows/visual/recollindex/recollindex.vcxproj.user
diff --git a/src/windows/recollq/recollq.vcxproj b/src/windows/visual/recollq/recollq.vcxproj
similarity index 100%
rename from src/windows/recollq/recollq.vcxproj
rename to src/windows/visual/recollq/recollq.vcxproj
diff --git a/src/windows/recollq/recollq.vcxproj.filters b/src/windows/visual/recollq/recollq.vcxproj.filters
similarity index 100%
rename from src/windows/recollq/recollq.vcxproj.filters
rename to src/windows/visual/recollq/recollq.vcxproj.filters
diff --git a/src/windows/trexe/trexecmd/trexecmd.sln b/src/windows/visual/trexe/trexecmd/trexecmd.sln
similarity index 100%
rename from src/windows/trexe/trexecmd/trexecmd.sln
rename to src/windows/visual/trexe/trexecmd/trexecmd.sln
diff --git a/src/windows/trexe/trexecmd/trexecmd.vcxproj b/src/windows/visual/trexe/trexecmd/trexecmd.vcxproj
similarity index 100%
rename from src/windows/trexe/trexecmd/trexecmd.vcxproj
rename to src/windows/visual/trexe/trexecmd/trexecmd.vcxproj
diff --git a/src/windows/trexe/trexecmd/trexecmd.vcxproj.filters b/src/windows/visual/trexe/trexecmd/trexecmd.vcxproj.filters
similarity index 100%
rename from src/windows/trexe/trexecmd/trexecmd.vcxproj.filters
rename to src/windows/visual/trexe/trexecmd/trexecmd.vcxproj.filters