diff --git a/ChangeLog b/ChangeLog
index 6747af66d9..ef8cccc8b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+Fri Apr 23 23:25:22 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb: $hdrdir should not contain macros for backward
+	  compatibilitiy.  [bruby-dev:28]
+
 Fri Apr 23 16:38:46 2004  Tanaka Akira  <akr@m17n.org>
 
-	* lib/pathname.rb: sync taint/freeze flag between 
+	* lib/pathname.rb: sync taint/freeze flag between
 	  a pathname object and its internal string object.
 
 Fri Apr 23 14:52:08 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index e518a7efe1..65ae853bac 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -79,8 +79,7 @@ end
 libdir = File.dirname(__FILE__)
 $extmk = libdir != Config::CONFIG["rubylibdir"]
 if not $extmk and File.exist? Config::CONFIG["archdir"] + "/ruby.h"
-  $topdir = Config::CONFIG["archdir"]
-  $hdrdir = $archdir
+  $hdrdir = $topdir = Config::CONFIG["archdir"]
 elsif File.exist? $srcdir + "/ruby.h"
   $topdir = Config::CONFIG["compile_dir"]
   $hdrdir = $srcdir