diff --git a/ChangeLog b/ChangeLog
index 5a99b1adfe..ea05d906b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep  2 22:10:38 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_file_p): Pathname#file?
+	  translated from pathname.rb.
+
 Thu Sep  2 09:12:02 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (rb_w32_spawn, rb_w32_aspawn): don't forget to free
diff --git a/ext/pathname/lib/pathname.rb b/ext/pathname/lib/pathname.rb
index 5fbe76affd..7391c7bce3 100644
--- a/ext/pathname/lib/pathname.rb
+++ b/ext/pathname/lib/pathname.rb
@@ -486,9 +486,6 @@ end
 
 class Pathname    # * FileTest *
 
-  # See <tt>FileTest.file?</tt>.
-  def file?() FileTest.file?(@path) end
-
   # See <tt>FileTest.pipe?</tt>.
   def pipe?() FileTest.pipe?(@path) end
 
diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c
index a19cc9eb68..3cd1764440 100644
--- a/ext/pathname/pathname.c
+++ b/ext/pathname/pathname.c
@@ -660,6 +660,15 @@ path_directory_p(VALUE self)
     return rb_funcall(rb_mFileTest, rb_intern("directory?"), 1, get_strpath(self));
 }
 
+/*
+ * See <tt>FileTest.file?</tt>.
+ */
+static VALUE
+path_file_p(VALUE self)
+{
+    return rb_funcall(rb_mFileTest, rb_intern("file?"), 1, get_strpath(self));
+}
+
 /*
  * == Pathname
  *
@@ -896,4 +905,5 @@ Init_pathname()
     rb_define_method(rb_cPathname, "exist?", path_exist_p, 0);
     rb_define_method(rb_cPathname, "grpowned?", path_grpowned_p, 0);
     rb_define_method(rb_cPathname, "directory?", path_directory_p, 0);
+    rb_define_method(rb_cPathname, "file?", path_file_p, 0);
 }