diff --git a/ChangeLog b/ChangeLog
index 3d84aeac96..50040a2358 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Apr 14 22:44:24 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* file.c (SET_EXTERNAL_ENCODING): avoid call rb_enc_check() on
+	  half-baked result string.
+
 Mon Apr 14 17:23:27 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* hash.c (rb_hash_delete_if, rb_hash_reject_bang, env_delete_if,
diff --git a/file.c b/file.c
index b247d834db..2cabda7d3e 100644
--- a/file.c
+++ b/file.c
@@ -2553,8 +2553,7 @@ rb_path_end(const char *path)
 
 #define SET_EXTERNAL_ENCODING() (\
     (void)(extenc || (extenc = rb_default_external_encoding())),\
-    rb_enc_associate(result, extenc),\
-    rb_enc_check(fname, result))
+    rb_enc_associate(result, extenc))
 
 static int is_absolute_path(const char*);