diff --git a/docs/msw/msys2-msw.md b/docs/msw/msys2-msw.md
index a0bdedd853..3b8aafe66e 100644
--- a/docs/msw/msys2-msw.md
+++ b/docs/msw/msys2-msw.md
@@ -11,35 +11,32 @@ For the MSys2 way please see https://github.com/Alexpux/MINGW-packages
 
 Building steps:
 
-1. Install the mingw32 packages needed to build wxMSW using the
+A. Install the mingw32 packages needed to build wxMSW using the
    configure/make build method.
-   From the MSys2 prompt or MSys2 MinGW prompt:
-
-   The 32 bit Mingw packages are prefixed with "mingw-w64-i686-";
-   Change the prefix to "mingw-w64-x86_64-" if you wish to do 64 bit.
+   From the MSys2 MinGW prompt:
 
         pacman -S --needed --noconfirm make
-        pacman -S --needed --noconfirm mingw-w64-i686-libjpeg-turbo
-        pacman -S --needed --noconfirm mingw-w64-i686-libpng
-        pacman -S --needed --noconfirm mingw-w64-i686-libtiff
-        pacman -S --needed --noconfirm mingw-w64-i686-gcc
+        pacman -S --needed --noconfirm ${MINGW_PACKAGE_PREFIX}-libjpeg-turbo
+        pacman -S --needed --noconfirm ${MINGW_PACKAGE_PREFIX}-libpng
+        pacman -S --needed --noconfirm ${MINGW_PACKAGE_PREFIX}-libtiff
+        pacman -S --needed --noconfirm ${MINGW_PACKAGE_PREFIX}-gcc
 
     Packages that are needed but are normally installed already.
 
-        pacman -S --needed --noconfirm mingw-w64-i686-gcc-libs
-        pacman -S --needed --noconfirm mingw-w64-i686-expat
-        pacman -S --needed --noconfirm mingw-w64-i686-xz
-        pacman -S --needed --noconfirm mingw-w64-i686-zlib
+        pacman -S --needed --noconfirm ${MINGW_PACKAGE_PREFIX}-gcc-libs
+        pacman -S --needed --noconfirm ${MINGW_PACKAGE_PREFIX}-expat
+        pacman -S --needed --noconfirm ${MINGW_PACKAGE_PREFIX}-xz
+        pacman -S --needed --noconfirm ${MINGW_PACKAGE_PREFIX}-zlib
 
 
-2. Build the wxMSW static library
+B. Build the wxMSW static library
     1. Open MSys2 MinGW Prompt
-   (These steps were tested on MinGW32; but, should work under MinGW64)
+   (These steps were tested on MinGW64; but, should work under MinGW32)
     2. Use the cd command to change directory to the wxWidgets top folder.
 
-    3. Create the "build-msw-static" folder to build the static libraries
+    3. Create the "build-${MSYSTEM_CARCH}-msw-static" folder to build the static libraries
 
-            mkdir -p build-msw-static
+            mkdir -p build-${MSYSTEM_CARCH}-msw-static
 
     4. Configure wxWidgets
 
@@ -48,7 +45,7 @@ Building steps:
         And, I think my old 32 bit Windows machine
         works best with it disabled.
 
-            cd build-msw-static && \
+            cd build-${MSYSTEM_CARCH}-msw-static && \
             ../configure --with-msw \
                 --disable-shared \
                 --disable-precomp-headers \
@@ -56,46 +53,46 @@ Building steps:
 
     5. make the wxMSW static libraries
 
-            cd build-msw-static && make && cd ..
+            cd build-${MSYSTEM_CARCH}-msw-static && make && cd ..
 
-3. Build and run the minimal static sample
+C. Build and run the minimal static sample
 
     1. Clean the minimal sample
 
-            cd build-msw-static/samples/minimal && make clean && cd ../../..
+            cd build-${MSYSTEM_CARCH}-msw-static/samples/minimal && make clean && cd ../../..
 
     2. Build the minimal sample
 
-            cd build-msw-static/samples/minimal && make && cd ../../..
+            cd build-${MSYSTEM_CARCH}-msw-static/samples/minimal && make && cd ../../..
 
     3. Run the minimal sample
 
-            ./build-msw-static/samples/minimal/minimal.exe
+            ./build-${MSYSTEM_CARCH}-msw-static/samples/minimal/minimal.exe
 
-4. Clean the static samples
+D. Clean the static samples
 
-        cd build-msw-static/samples && make clean && cd ../..
+        cd build-${MSYSTEM_CARCH}-msw-static/samples && make clean && cd ../..
 
-5.  Build and run the typetest static sample to verify MIME database works
+E.  Build and run the typetest static sample to verify MIME database works
 
-        cd build-msw-static/samples/typetest && make && cd ../../..
-        ./build-msw-static/samples/typetest/typetest.exe
+        cd build-${MSYSTEM_CARCH}-msw-static/samples/typetest && make && cd ../../..
+        ./build-${MSYSTEM_CARCH}-msw-static/samples/typetest/typetest.exe
 
-6.  Build and run the drawing static sample
+F.  Build and run the drawing static sample
 
-        cd build-msw-static/samples/drawing && make && cd ../../..
-        cd samples/drawing && ../../build-msw-static/samples/drawing/drawing.exe && cd ../..
+        cd build-${MSYSTEM_CARCH}-msw-static/samples/drawing && make && cd ../../..
+        cd samples/drawing && ../../build-${MSYSTEM_CARCH}-msw-static/samples/drawing/drawing.exe && cd ../..
 
-7.  Build and run the splash static sample
+G.  Build and run the splash static sample
 
-        cd build-msw-static/samples/splash && make && cd ../../..
-        cd samples/splash && ../../build-msw-static/samples/splash/splash.exe && cd ../..
+        cd build-${MSYSTEM_CARCH}-msw-static/samples/splash && make && cd ../../..
+        cd samples/splash && ../../build-${MSYSTEM_CARCH}-msw-static/samples/splash/splash.exe && cd ../..
 
-8.  Build and run the widgets static sample
+H.  Build and run the widgets static sample
 
-        cd build-msw-static/samples/widgets && make && cd ../../..
-        cd samples/widgets && ../../build-msw-static/samples/widgets/widgets.exe && cd ../..
+        cd build-${MSYSTEM_CARCH}-msw-static/samples/widgets && make && cd ../../..
+        cd samples/widgets && ../../build-${MSYSTEM_CARCH}-msw-static/samples/widgets/widgets.exe && cd ../..
 
-9.  Build all the rest of the static samples
+I.  Build all the rest of the static samples
 
-        cd build-msw-static/samples && make && cd ../..
+        cd build-${MSYSTEM_CARCH}-msw-static/samples && make && cd ../..