diff --git a/ChangeLog b/ChangeLog
index f1f29eb758..3a809bfc05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Mar 30 21:18:32 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/psych/extconf.rb: install psych .so to not psych/ but direct.
+	  This prepends to install *.rb files to psych/psych.
+
+	* ext/psych/lib/psych.rb: require 'psych.so'.
+
 Tue Mar 30 20:55:14 2010  Tanaka Akira  <akr@fsij.org>
 
 	* time.c (w2v): renamed from w2xv.
diff --git a/ext/psych/extconf.rb b/ext/psych/extconf.rb
index d789b35e5c..11f44ac104 100644
--- a/ext/psych/extconf.rb
+++ b/ext/psych/extconf.rb
@@ -11,6 +11,6 @@ end
 asplode('yaml.h')  unless find_header  'yaml.h'
 asplode('libyaml') unless find_library 'yaml', 'yaml_get_version'
 
-create_makefile 'psych/psych'
+create_makefile 'psych'
 
 # :startdoc:
diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb
index c14259373a..59307e3d99 100644
--- a/ext/psych/lib/psych.rb
+++ b/ext/psych/lib/psych.rb
@@ -1,4 +1,4 @@
-require 'psych/psych'
+require 'psych.so'
 require 'psych/nodes'
 require 'psych/visitors'
 require 'psych/handler'