diff --git a/gnulib/ChangeLog b/gnulib/ChangeLog
index b8c6c00889..bf617428c4 100644
--- a/gnulib/ChangeLog
+++ b/gnulib/ChangeLog
@@ -1,3 +1,11 @@
+2020-09-08  Tom Tromey  <tromey@adacore.com>
+
+	PR win32/25302:
+	* update-gnulib.sh: Apply stat patch.
+	* patches/0001-use-windows-stat: New file.
+	* import/m4/stat.m4: Update.
+	* configure: Rebuild.
+
 2020-08-26  Christian Biesinger  <cbiesinger@google.com>
 	    Pedro Alves  <palves@redhat.com>
 	    Joel Brobecker  <brobecker@adacore.com>
diff --git a/gnulib/configure b/gnulib/configure
index fa2feb5ea9..5c6add6e37 100644
--- a/gnulib/configure
+++ b/gnulib/configure
@@ -26907,8 +26907,7 @@ $as_echo "#define ssize_t int" >>confdefs.h
 
   case "$host_os" in
     mingw*)
-                  REPLACE_STAT=1
-      ;;
+                        ;;
     *)
                         { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5
 $as_echo_n "checking whether stat handles trailing slashes on files... " >&6; }
diff --git a/gnulib/import/m4/stat.m4 b/gnulib/import/m4/stat.m4
index 46e9abceee..8ef355f940 100644
--- a/gnulib/import/m4/stat.m4
+++ b/gnulib/import/m4/stat.m4
@@ -15,7 +15,7 @@ AC_DEFUN([gl_FUNC_STAT],
     mingw*)
       dnl On this platform, the original stat() returns st_atime, st_mtime,
       dnl st_ctime values that are affected by the time zone.
-      REPLACE_STAT=1
+      dnl REPLACE_STAT=1
       ;;
     *)
       dnl AIX 7.1, Solaris 9, mingw64 mistakenly succeed on stat("file/").
diff --git a/gnulib/patches/0001-use-windows-stat b/gnulib/patches/0001-use-windows-stat
new file mode 100644
index 0000000000..adf9638858
--- /dev/null
+++ b/gnulib/patches/0001-use-windows-stat
@@ -0,0 +1,13 @@
+diff --git a/gnulib/import/m4/stat.m4 b/gnulib/import/m4/stat.m4
+index 46e9abceee7..8ef355f9407 100644
+--- a/gnulib/import/m4/stat.m4
++++ b/gnulib/import/m4/stat.m4
+@@ -15,7 +15,7 @@ AC_DEFUN([gl_FUNC_STAT],
+     mingw*)
+       dnl On this platform, the original stat() returns st_atime, st_mtime,
+       dnl st_ctime values that are affected by the time zone.
+-      REPLACE_STAT=1
++      dnl REPLACE_STAT=1
+       ;;
+     *)
+       dnl AIX 7.1, Solaris 9, mingw64 mistakenly succeed on stat("file/").
diff --git a/gnulib/update-gnulib.sh b/gnulib/update-gnulib.sh
index b9cc7d8f35..ac5e3d56a2 100755
--- a/gnulib/update-gnulib.sh
+++ b/gnulib/update-gnulib.sh
@@ -173,6 +173,8 @@ apply_patches ()
     fi
 }
 
+apply_patches "patches/0001-use-windows-stat"
+
 # Regenerate all necessary files...
 aclocal &&
 autoconf &&