diff --git a/ChangeLog b/ChangeLog
index d8c75dfab..209a9e29c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-02  Colin Watson  <cjwatson@ubuntu.com>
+
+	* util/grub-probe.c (probe): Test st.st_mode using S_ISREG macro
+	rather than comparing against S_IFREG, which will almost never work.
+
 2009-09-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* commands/loadenv.c (check_blocklists): Fix off-by-one error.
diff --git a/util/grub-probe.c b/util/grub-probe.c
index 1710ec51b..3c54408c3 100644
--- a/util/grub-probe.c
+++ b/util/grub-probe.c
@@ -239,7 +239,7 @@ probe (const char *path, char *device_name)
 
       stat (path, &st);
 
-      if (st.st_mode == S_IFREG)
+      if (S_ISREG (st.st_mode))
 	{
 	  /* Regular file.  Verify that we can read it properly.  */