diff --git a/ChangeLog b/ChangeLog
index ed1d78ff16..f2da0d2df8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 05 04:06:49 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/xmlrpc/server.rb (XMLRPC::Server#serve): delete wrong call
+	  of "join".
+
 Sat Oct  1 23:55:24 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (do_select, rb_w32_select): brush up.
diff --git a/lib/xmlrpc/server.rb b/lib/xmlrpc/server.rb
index 788abc2d59..06a0d02c8b 100644
--- a/lib/xmlrpc/server.rb
+++ b/lib/xmlrpc/server.rb
@@ -645,7 +645,7 @@ class Server < WEBrickServlet
     end
     trap(signal) { @server.shutdown }
 
-    @server.start.join
+    @server.start
   end
   
   def shutdown