diff --git a/ChangeLog b/ChangeLog
index f634a9ed9a..e00d87f98c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sat Jul 17 13:48:22 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/lib/pathname.rb: moved from lib/pathname.rb.
+	  require pathname.so.
+
+	* ext/pathname/pathname.c: new file to define empty Pathname class.
+
+	* ext/pathname/extconf.rb: new file.
+
 Sat Jul 17 13:04:45 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* thread.c (rb_thread_wakeup_alive): split from rb_thread_wakeup.
diff --git a/ext/.document b/ext/.document
index 3e767d20a8..6f4f668ddf 100644
--- a/ext/.document
+++ b/ext/.document
@@ -47,6 +47,8 @@ openssl/ossl_x509req.c
 openssl/ossl_x509revoked.c
 openssl/ossl_x509store.c
 openssl/lib/openssl/buffering.rb
+pathname/pathname.c
+pathname/lib
 pty/pty.c
 pty/lib
 readline/readline.c
diff --git a/ext/pathname/extconf.rb b/ext/pathname/extconf.rb
new file mode 100644
index 0000000000..6720903e88
--- /dev/null
+++ b/ext/pathname/extconf.rb
@@ -0,0 +1,2 @@
+require 'mkmf'
+create_makefile('pathname')
diff --git a/lib/pathname.rb b/ext/pathname/lib/pathname.rb
similarity index 99%
rename from lib/pathname.rb
rename to ext/pathname/lib/pathname.rb
index f24fd4d76d..b150a31f69 100644
--- a/lib/pathname.rb
+++ b/ext/pathname/lib/pathname.rb
@@ -11,6 +11,8 @@
 # <tt>pathname.rb</tt> is distributed with Ruby since 1.8.0.
 #
 
+require 'pathname.so'
+
 #
 # == Pathname
 #
diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c
new file mode 100644
index 0000000000..36ad9c8708
--- /dev/null
+++ b/ext/pathname/pathname.c
@@ -0,0 +1,9 @@
+#include "ruby.h"
+
+static VALUE rb_cPathname;
+
+void
+Init_pathname()
+{
+    rb_cPathname = rb_define_class("Pathname", rb_cObject);
+}