diff --git a/ChangeLog b/ChangeLog
index b6615ad2f5..4b33bc3a7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Sat Jul 21 15:39:23 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jul 21 17:07:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): make OBJS depend on RUBY_EXTCONF_H
+	  only if extconf.h is created.
 
 	* {win32,wince,bcc32}/setup.mak (-version-): no RUBY_EXTERN magic.
 
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 0bc9f19293..1a3436490f 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1447,6 +1447,7 @@ site-install-rb: install-rb
     unless suffixes.empty?
       mfile.print ".SUFFIXES: .", suffixes.uniq.join(" ."), "\n\n"
     end
+    mfile.print "$(OBJS): $(RUBY_EXTCONF_H)\n\n" if $extconf_h
     mfile.print(*depout.flatten)
   else
     headers = %w[ruby.h defines.h]
@@ -1454,9 +1455,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