diff --git a/ChangeLog b/ChangeLog
index 73a7a9cd49..2cb4c1b2c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
-Tue Jan 15 17:26:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jan 15 17:53:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* enc/utf_8.c: renamed as IANA name.
 
+	* enc/Makefile.in: ditto.
+
 Tue Jan 15 16:59:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ruby.c (proc_options): encoding libraries cannot be loaded until
diff --git a/enc/Makefile.in b/enc/Makefile.in
index a1f9142a16..cafeff964a 100644
--- a/enc/Makefile.in
+++ b/enc/Makefile.in
@@ -15,7 +15,7 @@ DLEXT = @DLEXT@
 OBJEXT = @OBJEXT@
 
 BUILTIN_ENCS	= ascii.c us_ascii.c\
-		  unicode.c utf8.c
+		  unicode.c utf_8.c
 
 RUBY_SO_NAME = @RUBY_SO_NAME@
 LIBRUBY = @LIBRUBY@
@@ -34,7 +34,7 @@ CPPFLAGS = @CPPFLAGS@ -DONIG_ENC_REGISTER=rb_enc_register
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBRUBYARG@ @LIBS@ $(EXTLIBS)
 LDSHARED = @LDSHARED@
-ldflags  = $(CFLAGS) $(LDFLAGS)
+ldflags  = $(LDFLAGS)
 dldflags = @DLDFLAGS@
 archflag = @ARCH_FLAG@
 DLDFLAGS = $(ldflags) $(dldflags) $(archflag)