diff --git a/ChangeLog b/ChangeLog
index c80b1f5c7b..d37f1d9101 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Nov  1 17:17:26 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (file_expand_path): reset coderange after expanding path.
+
 Tue Nov  1 14:55:29 2011  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* io.c (nogvl_io_cntl): rb_cloexec_fcntl_dupfd's 2nd argument is int.
diff --git a/file.c b/file.c
index c38ce7dc40..9a9f5fcb90 100644
--- a/file.c
+++ b/file.c
@@ -3176,6 +3176,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
     if (tainted) OBJ_TAINT(result);
     rb_str_set_len(result, p - buf);
     rb_enc_check(fname, result);
+    ENC_CODERANGE_CLEAR(result);
     return result;
 }