diff --git a/ChangeLog b/ChangeLog
index fb215605f..46782e973 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-10  Pavel Roskin  <proski@gnu.org>
+
+	* conf/common.rmk: Compile tar.mod from tar.c, not cpio.c.  The
+	build system doesn't need to be aware of the tar.c internals.
+
 2009-06-09  Michel Hermier  <michel.hermier@gmail.com>
 
 	* fs/i386/pc/pxe.c (grub_pxefs_read): Fix returned values.
diff --git a/conf/common.rmk b/conf/common.rmk
index 978034161..027eff2f8 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -260,8 +260,8 @@ cpio_mod_CFLAGS = $(COMMON_CFLAGS)
 cpio_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For tar.mod.
-tar_mod_SOURCES = fs/cpio.c
-tar_mod_CFLAGS = $(COMMON_CFLAGS) -DMODE_USTAR
+tar_mod_SOURCES = fs/tar.c
+tar_mod_CFLAGS = $(COMMON_CFLAGS)
 tar_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For udf.mod.