diff --git a/ChangeLog b/ChangeLog
index cd417b162a..53fdaf8c85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 05 03:59:09 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* lib/xmlrpc/server.rb (XMLRPC::Server#serve): delete wrong call
+	  of "join".
+
 Thu Sep 29 10:26:18 2005  Tanaka Akira  <akr@m17n.org>
 
 	* ext/dl/dl.c (rb_io_to_ptr): abolish sizeof(FILE).
diff --git a/lib/xmlrpc/server.rb b/lib/xmlrpc/server.rb
index f2dad89258..e8ebc4759d 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