diff --git a/ChangeLog b/ChangeLog
index d6f078196..bdd2c80c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/emu/hostdisk.c (grub_util_check_file_presence): Use
+	windows method on other platforms without good stat as well.
+
 2013-10-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/osdep/linux/getroot.c: Add new btrfs defines.
diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c
index 81cf408ef..0121cc113 100644
--- a/grub-core/kern/emu/hostdisk.c
+++ b/grub-core/kern/emu/hostdisk.c
@@ -398,12 +398,12 @@ static struct grub_disk_dev grub_util_biosdisk_dev =
 static int
 grub_util_check_file_presence (const char *p)
 {
-#if defined (__MINGW32__) || defined(__CYGWIN__)
-  HANDLE h;
+#if !GRUB_UTIL_FD_STAT_IS_FUNCTIONAL
+  grub_util_fd_t h;
   h = grub_util_fd_open (p, GRUB_UTIL_FD_O_RDONLY);
   if (!GRUB_UTIL_FD_IS_VALID(h))
     return 0;
-  CloseHandle (h);
+  grub_util_fd_close (h);
   return 1;
 #else
   struct stat st;