diff --git a/ChangeLog b/ChangeLog
index 619eb1740a..62f809c5ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 25 15:53:54 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/rinda/ring.rb (Rinda::RingServer#shutdown): Join the killed
+	  threads.
+
 Sun May 25 15:26:17 2014  Tanaka Akira  <akr@fsij.org>
 
 	* lib/webrick/utils.rb: Override the inspect method of the thread
diff --git a/lib/rinda/ring.rb b/lib/rinda/ring.rb
index 2c29977d11..deef114092 100644
--- a/lib/rinda/ring.rb
+++ b/lib/rinda/ring.rb
@@ -225,6 +225,7 @@ module Rinda
 
       @w_services.each do |thread|
         thread.kill
+        thread.join
       end
 
       @sockets.each do |socket|
@@ -232,6 +233,7 @@ module Rinda
       end
 
       @r_service.kill
+      @r_service.join
     end
 
   end