diff --git a/ms-windows/mingw/build.sh b/ms-windows/mingw/build.sh
index 97146c315d6..1d8c5058a0f 100755
--- a/ms-windows/mingw/build.sh
+++ b/ms-windows/mingw/build.sh
@@ -81,6 +81,7 @@ mkdir -p "$BUILDDIR"
     -DUSE_CCACHE=ON \
     -DCMAKE_BUILD_TYPE=$buildtype \
     -DNATIVE_CRSSYNC_BIN="$CRSSYNC_BIN" \
+    -DNATIVE_Python_EXECUTABLE=python3 \
     -DBUILD_TESTING=OFF \
     -DENABLE_TESTS=OFF \
     -DQGIS_BIN_SUBDIR=bin \
diff --git a/ms-windows/mingw/mingwdeps.sh b/ms-windows/mingw/mingwdeps.sh
index 1cfc8276748..dc7748375c8 100755
--- a/ms-windows/mingw/mingwdeps.sh
+++ b/ms-windows/mingw/mingwdeps.sh
@@ -77,6 +77,7 @@ dnf install -y --nogpgcheck \
   proj-devel \
   python-devel \
   python-qt5 \
+  python3-qscintilla-qt5 \
   qt5-linguist \
   qt5-qtbase-devel \
   sqlite-devel \
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index dffbd02393c..5ebd5f6630d 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -339,10 +339,15 @@ if(WITH_QSCIAPI)
     COMMENT "Generating pyqgis api file" VERBATIM)
 
   # generate a .pap file to be immediately installed in QGIS source tree (the default .pap)
+  if(NATIVE_Python_EXECUTABLE)
+     set(_python ${NATIVE_Python_EXECUTABLE})
+  else()
+     set(_python ${Python_EXECUTABLE})
+  endif()
   add_custom_command(
     OUTPUT "${QGIS_PYTHON_PAP_FILE}"
     DEPENDS "${QGIS_PYTHON_API_FILE}"
-    COMMAND ${Python_EXECUTABLE} "${APIS_SRC_DIR}/generate_console_pap.py" -platform offscreen "${QGIS_PYTHON_PAP_FILE}" "${APIS_SRC_DIR}" "${APIS_OUT_DIR}"
+    COMMAND ${_python} "${APIS_SRC_DIR}/generate_console_pap.py" -platform offscreen "${QGIS_PYTHON_PAP_FILE}" "${APIS_SRC_DIR}" "${APIS_OUT_DIR}"
     WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
     COMMENT "Generating pap file for console auto-completion" VERBATIM)