diff --git a/config/libc/mingw-w64.in b/config/libc/mingw-w64.in
index 769c976f..34f8dbc8 100644
--- a/config/libc/mingw-w64.in
+++ b/config/libc/mingw-w64.in
@@ -10,6 +10,10 @@
 
 source "config/versions/mingw-w64.in"
 
+config MINGW_W64_REQUIRES_W64_VENDOR
+	bool
+	default y if MINGW_W64_V4_or_later
+
 config THREADS
     default "win32"  if THREADS_NATIVE
     default "posix"  if THREADS_POSIX
diff --git a/packages/mingw-w64/package.desc b/packages/mingw-w64/package.desc
index bbe507ac..1b6086cc 100644
--- a/packages/mingw-w64/package.desc
+++ b/packages/mingw-w64/package.desc
@@ -1,2 +1,3 @@
 repository='git https://git.code.sf.net/p/mingw-w64/mingw-w64'
 mirrors='http://downloads.sourceforge.net/sourceforge/mingw-w64 https://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/'
+milestones='v4'
diff --git a/scripts/build/libc/mingw-w64.sh b/scripts/build/libc/mingw-w64.sh
index 295b313b..21afb29d 100644
--- a/scripts/build/libc/mingw-w64.sh
+++ b/scripts/build/libc/mingw-w64.sh
@@ -63,10 +63,10 @@ do_libc_start_files() {
 
 do_check_mingw_vendor_tuple()
 {
-    if [ "${CT_MINGW_W64_VERSION%%.*}" -ge 4 ]; then
+    if [ "${CT_MINGW_W64_REQUIRES_W64_VENDOR}" = "y" ]; then
        CT_DoStep INFO "Checking configured vendor tuple"
-       if [ ${CT_TARGET_VENDOR} == w64 ]; then
-           CT_DoLog EXTRA "The tuple is set to '${CT_TARGET_VENDOR}', as recommended by mingw-64 developers."
+       if [ ${CT_TARGET_VENDOR} = "w64" ]; then
+           CT_DoLog DEBUG "The tuple is set to '${CT_TARGET_VENDOR}', as recommended by mingw-64 developers."
        else
            CT_DoLog WARN "The tuple vendor is '${CT_TARGET_VENDOR}', not equal to 'w64' and might break the toolchain!"
        fi