diff --git a/ChangeLog b/ChangeLog
index ce28aed16..380dacffd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-25  Robert Millan  <rmh.grub@aybabtu.com>
+
+	* fs/cpio.c [MODE_USTAR]: Initialize `tar' module instead of
+	`cpio'.
+	[! MODE_USTAR]: Initialize `cpio' module instead of `tar'.
+
 2009-10-25  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* configure.ac: Check for `__ashldi3', `__ashrdi3', `__lshrdi3',
diff --git a/fs/cpio.c b/fs/cpio.c
index 7c6ada9b3..3f3a3d1a0 100644
--- a/fs/cpio.c
+++ b/fs/cpio.c
@@ -352,9 +352,9 @@ static struct grub_fs grub_cpio_fs = {
 };
 
 #ifdef MODE_USTAR
-GRUB_MOD_INIT (cpio)
-#else
 GRUB_MOD_INIT (tar)
+#else
+GRUB_MOD_INIT (cpio)
 #endif
 {
   grub_fs_register (&grub_cpio_fs);