diff --git a/ChangeLog b/ChangeLog
index 7957857a3e..4fad314c7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Mar 20 22:51:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (mkmf_failed): check if Makefile is created without
+	  create_makefile.
+
 Sat Mar 19 23:48:10 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* misc/ruby-mode.el (ruby-expr-beg): returned true always.
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index f15d0ead36..5263c4b07b 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1053,7 +1053,7 @@ Provided configuration options:
 MESSAGE
 
 def mkmf_failed(path)
-  unless $makefile_created
+  unless $makefile_created or File.exist?("Makefile")
     opts = $arg_config.collect {|t, n| "\t#{t}#{"=#{n}" if n}\n"}
     abort "*** #{path} failed ***\n" + FailedMassage + opts.join
   end