diff --git a/kotlin-native/konan/konan.properties b/kotlin-native/konan/konan.properties
index 32be2bad41a..0af85283fef 100644
--- a/kotlin-native/konan/konan.properties
+++ b/kotlin-native/konan/konan.properties
@@ -924,7 +924,7 @@ runtimeDefinitions.mingw_x64 = USE_GCC_UNWIND=1 USE_PE_COFF_SYMBOLS=1 KONAN_WIND
   UNICODE KONAN_X64=1 KONAN_NO_MEMMEM=1
 
 # Windows i686, based on mingw-w64.
-targetToolchain.mingw_x64-mingw_x86 = msys2-mingw-w64-i686-clang-llvm-lld-compiler_rt-8.0.1
+targetToolchain.mingw_x64-mingw_x86 = msys2-mingw-w64-i686-1
 targetToolchain.linux_x64-mingw_x86 = $llvmHome.linux_x64
 targetToolchain.macos_x64-mingw_x86 = $llvmHome.macos_x64
 targetToolchain.macos_arm64-mingw_x86 = $llvmHome.macos_arm64
@@ -935,17 +935,17 @@ linker.macos_x64-mingw_x86 = $targetToolchain.macos_x64-mingw_x86/bin/ld.lld
 linker.macos_arm64-mingw_x86 = $targetToolchain.macos_arm64-mingw_x86/bin/ld.lld
 
 dependencies.mingw_x64-mingw_x86 = \
-    msys2-mingw-w64-i686-clang-llvm-lld-compiler_rt-8.0.1 \
+    msys2-mingw-w64-i686-1 \
     lld-12.0.1-windows-x64
 dependencies.linux_x64-mingw_x86 = \
-    msys2-mingw-w64-i686-clang-llvm-lld-compiler_rt-8.0.1
+    msys2-mingw-w64-i686-1
 dependencies.macos_x64-mingw_x86 = \
-    msys2-mingw-w64-i686-clang-llvm-lld-compiler_rt-8.0.1
+    msys2-mingw-w64-i686-1
 dependencies.macos_arm64-mingw_x86 = \
-    msys2-mingw-w64-i686-clang-llvm-lld-compiler_rt-8.0.1
+    msys2-mingw-w64-i686-1
 
 targetTriple.mingw_x86 = i686-pc-windows-gnu
-targetSysRoot.mingw_x86 = msys2-mingw-w64-i686-clang-llvm-lld-compiler_rt-8.0.1
+targetSysRoot.mingw_x86 = msys2-mingw-w64-i686-1
 # Make sure that SSE2 is available by setting target-cpu to pentium4
 targetCpu.mingw_x86 = pentium4
 # For using with Universal Windows Platform (UWP) we need to use slower -emulated-tls option.
diff --git a/kotlin-native/samples/tetris/build.gradle.kts b/kotlin-native/samples/tetris/build.gradle.kts
index e99742dec81..8825de7bad8 100644
--- a/kotlin-native/samples/tetris/build.gradle.kts
+++ b/kotlin-native/samples/tetris/build.gradle.kts
@@ -39,7 +39,7 @@ kotlin {
                     val windresTask = tasks.register<Exec>(taskName) {
                         val llvmDir = when (preset) {
                             presets["mingwX86"] -> kotlinNativeDataPath.resolve(
-                                    "dependencies/msys2-mingw-w64-i686-clang-llvm-lld-compiler_rt-8.0.1/bin")
+                                    "dependencies/msys2-mingw-w64-i686-1/bin")
                             presets["mingwX64"] -> kotlinNativeDataPath.resolve(
                                     "dependencies/msys2-mingw-w64-x86_64-1/bin")
                             else -> throw GradleException("Unsupported presets")