diff --git a/ChangeLog b/ChangeLog
index c9c9e10a93..ce779f2ae9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Thu Feb 19 14:18:25 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Feb 19 14:22:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (create_makefile): added phony targets.
 
 	* lib/mkmf.rb (create_makefile): creates target directories before
 	  copying.  [ruby-core:21958]
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 6e936c7677..260e8eb03a 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1441,6 +1441,8 @@ CLEANFILES = #{$cleanfiles.join(' ')}
 DISTCLEANFILES = #{$distcleanfiles.join(' ')}
 
 all install static install-so install-rb: Makefile
+.PHONY: all install static install-so install-rb
+.PHONY: clean clean-so clean-rb
 
 RULES
 end
@@ -1634,7 +1636,7 @@ CLEANFILES = #{$cleanfiles.join(' ')}
 DISTCLEANFILES = #{$distcleanfiles.join(' ')}
 DISTCLEANDIRS = #{$distcleandirs.join(' ')}
 
-extout = #{$extout}
+extout = #{$extout && $extout.quote}
 extout_prefix = #{$extout_prefix}
 target_prefix = #{target_prefix}
 LOCAL_LIBS = #{$LOCAL_LIBS}
@@ -1657,6 +1659,8 @@ CLEANOBJS     = *.#{$OBJEXT} #{config_string('cleanobjs') {|t| t.gsub(/\$\*/, "$
 
 all:    #{$extout ? "install" : target ? "$(DLLIB)" : "Makefile"}
 static: $(STATIC_LIB)#{$extout ? " install-rb" : ""}
+.PHONY: all install static install-so install-rb
+.PHONY: clean clean-so clean-rb
 "
   mfile.print CLEANINGS
   fsep = config_string('BUILD_FILE_SEPARATOR') {|s| s unless s == "/"}