diff --git a/ChangeLog b/ChangeLog
index 2803321594..327dcb1064 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 19 04:54:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rake.rb (FileUtils#ruby): takes care of space containing path.
+	  [ ruby-Bugs-21591 ]
+
 Tue Aug 19 01:32:37 2008  Tanaka Akira  <akr@fsij.org>
 
 	* io.c (rb_open_file): encoding in mode string was ignored if perm is
diff --git a/lib/rake.rb b/lib/rake.rb
index 147d05c531..068a0ceb21 100755
--- a/lib/rake.rb
+++ b/lib/rake.rb
@@ -917,7 +917,7 @@ module FileUtils
     if args.length > 1 then
       sh(*([RUBY] + args + [options]), &block)
     else
-      sh("#{RUBY} #{args.first}", options, &block)
+      sh("#{RUBY.sub(/.*\s.*/m, '"\&"')} #{args.first}", options, &block)
     end
   end