diff --git a/ChangeLog b/ChangeLog
index 518df3e344..2275785525 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Apr 25 23:45:02 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* lib/rinda/ring.rb (Rinda::RingServer#initialize): add a socket
+	  to @sockets in make_socket() to close sockets on shutdown even if
+	  make_socket() is called after initialize.
+
+	* lib/rinda/ring.rb (Rinda::RingServer#make_socket): ditto.
+
 Thu Apr 25 23:39:42 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
 
 	* test/rinda/test_rinda.rb (TupleSpaceProxyTest#test_take_bug_8215):
diff --git a/lib/rinda/ring.rb b/lib/rinda/ring.rb
index 9b3e273ea1..f6566c906a 100644
--- a/lib/rinda/ring.rb
+++ b/lib/rinda/ring.rb
@@ -78,7 +78,8 @@ module Rinda
       @renewer = Renewer.new
 
       @ts = ts
-      @sockets = addresses.map do |address|
+      @sockets = []
+      addresses.each do |address|
         make_socket(address)
       end
 
@@ -94,6 +95,7 @@ module Rinda
 
       socket = Socket.new(addrinfo.pfamily, addrinfo.socktype,
                           addrinfo.protocol)
+      @sockets << socket
 
       if addrinfo.ipv4_multicast? or addrinfo.ipv6_multicast? then
         if Socket.const_defined?(:SO_REUSEPORT) then