diff --git a/ChangeLog b/ChangeLog
index 1b47597d91..69c66309c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,8 @@
-Sun Jun 10 14:48:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jun 10 15:11:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* Makefile.in, win32/Makefile.sub (XCFLAGS): -I. is needed for *.inc.
 
-	* ext/extmk.rb (parse_args): add also topdir to mflags.
+	* ext/extmk.rb: prepend also topdir to mflags at last.
 
 Sun Jun 10 13:47:36 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 17b918d1be..e4b62c8553 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -289,7 +289,7 @@ def parse_args()
     $extout = '$(topdir)/'+$extout
     RbConfig::CONFIG["extout"] = CONFIG["extout"] = $extout
     $extout_prefix = $extout ? "$(extout)$(target_prefix)/" : ""
-    $mflags << "topdir=#$topdir" << "extout=#$extout" << "extout_prefix=#$extout_prefix"
+    $mflags << "extout=#$extout" << "extout_prefix=#$extout_prefix"
   end
 end
 
@@ -523,6 +523,7 @@ if $nmake == ?b
     vars.each {|flag| flag.sub!(/\A/, "-D")}
   end
 end
+$mflags.unshift("topdir=#$topdir")
 system($make, *sysquote($mflags)) or exit($?.exitstatus)
 
 #Local variables: