diff --git a/ChangeLog b/ChangeLog
index 6cd614f8b9..697225828b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug 12 21:18:27 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_lstat): Pathname#lstat translated
+	  from pathname.rb.
+
 Thu Aug 12 05:58:09 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* include/ruby/encoding.h (rb_char_to_option_kcode): used in
diff --git a/ext/pathname/lib/pathname.rb b/ext/pathname/lib/pathname.rb
index c608b4dd1e..7a75b4fa47 100644
--- a/ext/pathname/lib/pathname.rb
+++ b/ext/pathname/lib/pathname.rb
@@ -512,9 +512,6 @@ end
 
 class Pathname    # * File *
 
-  # See <tt>File.lstat</tt>.
-  def lstat() File.lstat(@path) end
-
   # See <tt>File.symlink</tt>.  Creates a symbolic link.
   def make_symlink(old) File.symlink(old, @path) end
 
diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c
index b739fc1f0e..9462d26793 100644
--- a/ext/pathname/pathname.c
+++ b/ext/pathname/pathname.c
@@ -384,6 +384,15 @@ path_stat(VALUE self)
     return rb_funcall(rb_cFile, rb_intern("stat"), 1, get_strpath(self));
 }
 
+/*
+ * See <tt>File.lstat</tt>.
+ */
+static VALUE
+path_lstat(VALUE self)
+{
+    return rb_funcall(rb_cFile, rb_intern("lstat"), 1, get_strpath(self));
+}
+
 /*
  * == Pathname
  *
@@ -599,4 +608,5 @@ Init_pathname()
     rb_define_method(rb_cPathname, "readlink", path_readlink, 0);
     rb_define_method(rb_cPathname, "rename", path_rename, 1);
     rb_define_method(rb_cPathname, "stat", path_stat, 0);
+    rb_define_method(rb_cPathname, "lstat", path_lstat, 0);
 }