diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0e348602..61f336ea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,52 +13,52 @@ jobs:
         include:
         - target_ruby: "3.3.2"
           arch: "x86-msvcrt"
-          build_ruby: "3.1.4/x64"
+          build_ruby: "3.1.5/x64"
           run_mri_spec: v3_3_0
 
         - target_ruby: "3.3.2"
           arch: "x64-ucrt"
-          build_ruby: "3.1.4/x64"
+          build_ruby: "3.1.5/x64"
           run_mri_spec: v3_3_0
 
         - target_ruby: "3.2.4"
           arch: "x86-msvcrt"
-          build_ruby: "3.1.4/x64"
+          build_ruby: "3.1.5/x64"
           run_mri_spec: v3_2_2
 
         - target_ruby: "3.2.4"
           arch: "x64-ucrt"
-          build_ruby: "3.1.4/x64"
+          build_ruby: "3.1.5/x64"
           run_mri_spec: v3_2_2
 
         - target_ruby: "3.1.6"
           arch: "x86-msvcrt"
-          build_ruby: "3.0.6/x64"
+          build_ruby: "3.0.7/x64"
           run_mri_spec: v3_1_4
 
         - target_ruby: "3.1.6"
           arch: "x64-ucrt"
-          build_ruby: "3.0.6/x64"
+          build_ruby: "3.0.7/x64"
           run_mri_spec: v3_1_4
 
         - target_ruby: "3.0.7"
           arch: "x86-msvcrt"
-          build_ruby: "3.1.4/x64"
+          build_ruby: "3.1.5/x64"
           run_mri_spec: v3_0_6
 
         - target_ruby: "3.0.7"
           arch: "x64-msvcrt"
-          build_ruby: "3.1.4/x64"
+          build_ruby: "3.1.5/x64"
           run_mri_spec: v3_0_6
 
         - target_ruby: "head"
           arch: "x64-ucrt"
-          build_ruby: "3.0.6/x64"
+          build_ruby: "3.0.7/x64"
           run_mri_spec: master
 
         - target_ruby: "head"
           arch: "x86-msvcrt"
-          build_ruby: "3.0.6/x64"
+          build_ruby: "3.0.7/x64"
           run_mri_spec: master
 
     runs-on: windows-latest
diff --git a/CHANGELOG-3.0.md b/CHANGELOG-3.0.md
index 45a8aad8..c3f4ab22 100644
--- a/CHANGELOG-3.0.md
+++ b/CHANGELOG-3.0.md
@@ -10,6 +10,8 @@
 - Update the bundled MSYS2 keyring package.
 - Avoid crash even if a registry key incldues inconvertible characters
 - Avoid method redefinition warning in rubygems hook
+- Allow setting of MSYS2 path by environment variable `MSYS2_PATH`. [#361](https://github.com/oneclick/rubyinstaller2/issues/361)
+  This setting is preferred over all other methods to find the MSYS2 directory.
 
 
 ## RubyInstaller-3.0.6-1 - 2023-04-01
diff --git a/CHANGELOG-3.1.md b/CHANGELOG-3.1.md
index f257e237..a9e96155 100644
--- a/CHANGELOG-3.1.md
+++ b/CHANGELOG-3.1.md
@@ -10,6 +10,8 @@
 - Update the bundled MSYS2 keyring package.
 - Avoid crash even if a registry key incldues inconvertible characters
 - Avoid method redefinition warning in rubygems hook
+- Allow setting of MSYS2 path by environment variable `MSYS2_PATH`. [#361](https://github.com/oneclick/rubyinstaller2/issues/361)
+  This setting is preferred over all other methods to find the MSYS2 directory.
 
 
 ## RubyInstaller-3.1.4-1 - 2023-04-01
diff --git a/CHANGELOG-3.3.md b/CHANGELOG-3.3.md
index f9e55c11..fad474a0 100644
--- a/CHANGELOG-3.3.md
+++ b/CHANGELOG-3.3.md
@@ -8,6 +8,8 @@
 - Update the bundled MSYS2 keyring package.
 - Avoid crash even if a registry key incldues inconvertible characters
 - Avoid method redefinition warning in rubygems hook
+- Allow setting of MSYS2 path by environment variable `MSYS2_PATH`. [#361](https://github.com/oneclick/rubyinstaller2/issues/361)
+  This setting is preferred over all other methods to find the MSYS2 directory.
 
 
 ## RubyInstaller-3.3.0-1 - 2023-12-26
diff --git a/README.md b/README.md
index e1e8f9fc..4545e332 100644
--- a/README.md
+++ b/README.md
@@ -124,5 +124,5 @@ Check the [wiki on how to use](https://github.com/oneclick/rubyinstaller2/wiki/F
 
 ## Known Issues
 
-- It's best to avoid installation into a PATH containing spaces. Some gems won't install.
+- It's best to avoid installation into a PATH containing spaces or non-ASCII. Some gems won't install with spaces and older ruby versions (<= 3.0.x) ridk won't even run then at all with special characters.
 - Also refer to [the issue list](https://github.com/larskanis/rubyinstaller2/issues).