diff --git a/ChangeLog b/ChangeLog
index 557050df94..7d127c26f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 16 06:07:24 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_rmdir): Pathname#rmdir translated
+	  from pathname.rb.
+
 Thu Sep 16 00:36:25 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/readline/extconf.rb: Remove Readline 6 check because
diff --git a/ext/pathname/lib/pathname.rb b/ext/pathname/lib/pathname.rb
index fdbafc512b..ac8d106e11 100644
--- a/ext/pathname/lib/pathname.rb
+++ b/ext/pathname/lib/pathname.rb
@@ -494,9 +494,6 @@ class Pathname    # * Dir *
     Dir.foreach(@path) {|f| yield self.class.new(f) }
   end
 
-  # See <tt>Dir.rmdir</tt>.  Remove the referenced directory.
-  def rmdir() Dir.rmdir(@path) end
-
   # See <tt>Dir.open</tt>.
   def opendir(&block) # :yield: dir
     Dir.open(@path, &block)
diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c
index 1eeddfb503..cc1fd8c678 100644
--- a/ext/pathname/pathname.c
+++ b/ext/pathname/pathname.c
@@ -895,6 +895,15 @@ path_mkdir(int argc, VALUE *argv, VALUE self)
         return rb_funcall(rb_cDir, rb_intern("mkdir"), 2, str, vmode);
 }
 
+/*
+ * See <tt>Dir.rmdir</tt>.  Remove the referenced directory.
+ */
+static VALUE
+path_rmdir(VALUE self)
+{
+    return rb_funcall(rb_cDir, rb_intern("rmdir"), 1, get_strpath(self));
+}
+
 /*
  * == Pathname
  *
@@ -1153,4 +1162,5 @@ Init_pathname()
     rb_define_singleton_method(rb_cPathname, "pwd", path_s_getwd, 0);
     rb_define_method(rb_cPathname, "entries", path_entries, 0);
     rb_define_method(rb_cPathname, "mkdir", path_mkdir, -1);
+    rb_define_method(rb_cPathname, "rmdir", path_rmdir, 0);
 }