diff --git a/ChangeLog b/ChangeLog
index da43c9c43a..f9601bb955 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Sat Feb  3 01:25:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Feb  3 02:36:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* proc.c (yarv_proc_alloc): needs return.
 
@@ -11,6 +11,9 @@ Sat Feb  3 01:25:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* regenc.h: revert to before YARV.
 
+	* lib/mkmf.rb (create_makefile): make object files depend on
+	  extconf.h even if depend file exists.
+
 Fri Feb  2 23:39:42 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* common.mk (bin): add more dependency.  a patch from Tadashi
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 4e00332096..b055c861c9 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1335,7 +1335,7 @@ site-install-rb: install-rb
     end
   end
 
-  sep = config_string('BUILD_FILE_SEPARATOR') {|sep| ":/=#{sep}" if sep != "/"} || ""
+  sep = config_string('BUILD_FILE_SEPARATOR') {|s| ":/=#{s}" if s != "/"} || ""
   mfile.print "$(RUBYARCHDIR)/" if $extout
   mfile.print "$(DLLIB): ", (makedef ? "$(DEFFILE) " : ""), "$(OBJS)\n"
   mfile.print "\t@-$(RM) $(@#{sep})\n"
@@ -1415,9 +1415,9 @@ site-install-rb: install-rb
       headers.each {|h| h.sub!(/.*/, &RULE_SUBST.method(:%))}
     end
     headers << $config_h if $config_h
-    headers << "$(RUBY_EXTCONF_H)" if $extconf_h
     mfile.print "$(OBJS): ", headers.join(' '), "\n"
   end
+  mfile.print "\n$(OBJS): $(RUBY_EXTCONF_H)\n"
 
   $makefile_created = true
 ensure