diff --git a/ChangeLog b/ChangeLog
index 50c4c8b0a2..a81068d0b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May  9 08:24:24 2010  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (disconnect): terminates @receiver_thread even if
+	  @sock.shutdown raises an exception.  [ruby-dev:34881]
+
 Sun May  9 06:15:21 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* io.c (nogvl_copy_stream_sendfile): ISO C90 forbids mixed
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index 46e8f201a1..0f6a4372d5 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -307,9 +307,12 @@ module Net
         end
       rescue Errno::ENOTCONN
         # ignore `Errno::ENOTCONN: Socket is not connected' on some platforms.
+      rescue Exception => e
+        @receiver_thread.raise(e)
       end
       @receiver_thread.join
       @sock.close
+      raise e if e
     end
 
     # Returns true if disconnected from the server.
@@ -1012,7 +1015,10 @@ module Net
 
       @client_thread = Thread.current
       @receiver_thread = Thread.start {
-        receive_responses
+        begin
+          receive_responses
+        rescue Exception
+        end
       }
     end
 
diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb
index 501298cdc4..0ecd3e8de5 100644
--- a/test/net/imap/test_imap.rb
+++ b/test/net/imap/test_imap.rb
@@ -311,6 +311,43 @@ class IMAPTest < Test::Unit::TestCase
     end
   end
 
+  def test_exception_during_shutdown
+    server = TCPServer.new(0)
+    port = server.addr[1]
+    Thread.start do
+      begin
+        sock = server.accept
+        begin
+          sock.print("* OK test server\r\n")
+          sock.gets
+          sock.print("* BYE terminating connection\r\n")
+          sock.print("RUBY0001 OK LOGOUT completed\r\n")
+        ensure
+          sock.close
+        end
+      rescue
+      end
+    end
+    begin
+      begin
+        imap = Net::IMAP.new("localhost", :port => port)
+        imap.instance_eval do
+          def @sock.shutdown(*args)
+            super
+            raise "error"
+          end
+        end
+        imap.logout
+      ensure
+        assert_raise(RuntimeError) do
+          imap.disconnect
+        end
+      end
+    ensure
+      server.close
+    end
+  end
+
   private
 
   def imaps_test