diff --git a/ChangeLog b/ChangeLog
index 877e31002a..bef9e85389 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 27 03:23:43 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): should point correct path to
+	  ruby.h and defines.h.   [ruby-core:21570]
+
 Mon Jan 26 16:00:40 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* array.c (rb_ary_aset): fixed arguments evaluation order.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index ec264796ae..67f9b97aa9 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1784,7 +1784,7 @@ site-install-rb: install-rb
   if File.exist?(depend)
     mfile.print("###\n", *depend_rules(File.read(depend)))
   else
-    headers = %w[ruby.h defines.h]
+    headers = %w[$(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h]
     if RULE_SUBST
       headers.each {|h| h.sub!(/.*/, &RULE_SUBST.method(:%))}
     end