diff --git a/ChangeLog b/ChangeLog
index d88b5b969..70f5a1a66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-20  Yoshinori K. Okuji  <okuji@enbug.org>
+
+	* util/i386/pc/grub-probefs.c (main): Call grub_xfs_init and
+	grub_xfs_fini. Do not call grub_hfs_init or grub_hfs_fini any
+	longer, because HFS should not be used on PC.
+
 2005-10-20  Timothy Baldwin  <T.E.Baldwin99@members.leeds.ac.uk>
 
 	* io/gzio.c (grub_gzio_read): Use OFFSET instead of FILE->OFFSET
diff --git a/util/i386/pc/grub-probefs.c b/util/i386/pc/grub-probefs.c
index b88574720..97f338325 100644
--- a/util/i386/pc/grub-probefs.c
+++ b/util/i386/pc/grub-probefs.c
@@ -186,8 +186,8 @@ main (int argc, char *argv[])
   grub_ext2_init ();
   grub_ufs_init ();
   grub_minix_init ();
-  grub_hfs_init ();
   grub_jfs_init ();
+  grub_xfs_init ();
 
   /* Do it.  */
   probe (path);
@@ -197,8 +197,8 @@ main (int argc, char *argv[])
   grub_fat_fini ();
   grub_ufs_fini ();
   grub_minix_fini ();
-  grub_hfs_fini ();
   grub_jfs_fini ();
+  grub_xfs_fini ();
   
   grub_pc_partition_map_fini ();
   grub_util_biosdisk_fini ();