diff --git a/install-wrappers.sh b/install-wrappers.sh
index 98ce917..35145ea 100755
--- a/install-wrappers.sh
+++ b/install-wrappers.sh
@@ -124,7 +124,7 @@ fi
 mkdir -p "$PREFIX/bin"
 cp wrappers/*-wrapper.sh "$PREFIX/bin"
 for arch in $ARCHS; do
-    cp wrappers/$arch-w64-mingw32.cfg $PREFIX/bin
+    cp wrappers/$arch-w64-windows-gnu.cfg $PREFIX/bin
 done
 if [ -n "$HOST" ] && [ -n "$EXEEXT" ]; then
     # TODO: If building natively on msys, pick up the default HOST value from there.
diff --git a/wrappers/aarch64-w64-mingw32.cfg b/wrappers/aarch64-w64-windows-gnu.cfg
similarity index 100%
rename from wrappers/aarch64-w64-mingw32.cfg
rename to wrappers/aarch64-w64-windows-gnu.cfg
diff --git a/wrappers/armv7-w64-mingw32.cfg b/wrappers/armv7-w64-windows-gnu.cfg
similarity index 100%
rename from wrappers/armv7-w64-mingw32.cfg
rename to wrappers/armv7-w64-windows-gnu.cfg
diff --git a/wrappers/clang-target-wrapper.c b/wrappers/clang-target-wrapper.c
index 9421ab0..0eba6ab 100644
--- a/wrappers/clang-target-wrapper.c
+++ b/wrappers/clang-target-wrapper.c
@@ -78,8 +78,8 @@ int _tmain(int argc, TCHAR* argv[]) {
         exec_argv[arg++] = _T("-D_UCRT");
     }
 
-    exec_argv[arg++] = _T("--config");
-    exec_argv[arg++] = concat(arch, _T("-w64-mingw32.cfg"));
+    exec_argv[arg++] = _T("-target");
+    exec_argv[arg++] = target;
     exec_argv[arg++] = _T("--end-no-unused-arguments");
 
     for (int i = 1; i < argc; i++)
diff --git a/wrappers/clang-target-wrapper.sh b/wrappers/clang-target-wrapper.sh
index ed45a22..42e8578 100755
--- a/wrappers/clang-target-wrapper.sh
+++ b/wrappers/clang-target-wrapper.sh
@@ -92,7 +92,7 @@ mingw32uwp)
     ;;
 esac
 
-FLAGS="$FLAGS --config $ARCH-w64-mingw32.cfg"
+FLAGS="$FLAGS -target $TARGET"
 FLAGS="$FLAGS --end-no-unused-arguments"
 
 $CCACHE "$CLANG" $FLAGS "$@" $LINKER_FLAGS
diff --git a/wrappers/i686-w64-mingw32.cfg b/wrappers/i686-w64-windows-gnu.cfg
similarity index 100%
rename from wrappers/i686-w64-mingw32.cfg
rename to wrappers/i686-w64-windows-gnu.cfg
diff --git a/wrappers/x86_64-w64-mingw32.cfg b/wrappers/x86_64-w64-windows-gnu.cfg
similarity index 100%
rename from wrappers/x86_64-w64-mingw32.cfg
rename to wrappers/x86_64-w64-windows-gnu.cfg