diff --git a/ChangeLog b/ChangeLog
index a66a5d7d19..0c922bac12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb 24 20:21:38 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/drb/drbtest.rb (add_service_command): quote pathnames in the
+          server's command line for space contained directory names.
+          Thanks, arton. [ruby-dev:28386]
+
 Fri Feb 24 12:10:07 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* instruby.rb: install *.exe.manifest and *.dll.manifest if exist.
diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb
index 30aafb5788..faf6c059d9 100644
--- a/test/drb/drbtest.rb
+++ b/test/drb/drbtest.rb
@@ -16,7 +16,7 @@ class DRbService
   @@ruby += " -d" if $DEBUG
   def self.add_service_command(nm)
     dir = File.dirname(File.expand_path(__FILE__))
-    DRb::ExtServManager.command[nm] = "#{@@ruby} #{dir}/#{nm}"
+    DRb::ExtServManager.command[nm] = "\"#{@@ruby}\" \"#{dir}/#{nm}\""
   end
 
   %w(ut_drb.rb ut_array.rb ut_port.rb ut_large.rb ut_safe1.rb ut_eval.rb).each do |nm|