diff --git a/ChangeLog b/ChangeLog
index 84ad4f9ec..9ec293dda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/fs/ufs.c (grub_ufs_mtime) [MODE_UFS2]: Check mtime field
+	as well.
+
 2011-11-03  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Make reiserfs label retrieval similar to other *_label functions.
diff --git a/grub-core/fs/ufs.c b/grub-core/fs/ufs.c
index e951d6ce3..cd2994895 100644
--- a/grub-core/fs/ufs.c
+++ b/grub-core/fs/ufs.c
@@ -761,11 +761,13 @@ grub_ufs_mtime (grub_device_t device, grub_int32_t *tm)
   if (!data)
     *tm = 0;
   else
+    {
+      *tm = grub_le_to_cpu32 (data->sblock.mtime);
 #ifdef MODE_UFS2
-    *tm = grub_le_to_cpu64 (data->sblock.mtime2);
-#else
-    *tm = grub_le_to_cpu32 (data->sblock.mtime);
+      if (*tm < (grub_int64_t) grub_le_to_cpu64 (data->sblock.mtime2))
+	*tm = grub_le_to_cpu64 (data->sblock.mtime2);
 #endif
+    }
 
   grub_dl_unref (my_mod);