diff --git a/ChangeLog b/ChangeLog
index 8914c41584..3d71434870 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 19 00:04:19 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* lib/drb/drb.rb (DRbServer#stop_service): join killed thread to
+	  ensure service stops.  [ruby-dev:40441]
+
 Thu Feb 18 22:31:15 2010  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* math.c (math_atanh): raise ERANGE without calling atanh if absolute
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index a2c11f980d..4712306fe0 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -1394,7 +1394,7 @@ module DRb
       if  Thread.current['DRb'] && Thread.current['DRb']['server'] == self
         Thread.current['DRb']['stop_service'] = true
       else
-        @thread.kill
+        @thread.kill.join
       end
     end