diff --git a/ChangeLog b/ChangeLog
index 33381a679e..f1f70f8254 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Apr  3 19:00:52 2012  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/net/ftp/test_ftp.rb (FTPTest#create_ftp_server): should wait
+	  a little before closing socket because if the client call
+	  Net::FTP#getmultiline the socket is suddenly closed by the server in
+	  the getline loop.
+
 Tue Apr  3 18:33:38 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* process.c (setreuid, setregid): suppress warnings.
diff --git a/test/net/ftp/test_ftp.rb b/test/net/ftp/test_ftp.rb
index a020b7d0f9..c5f598fba6 100644
--- a/test/net/ftp/test_ftp.rb
+++ b/test/net/ftp/test_ftp.rb
@@ -591,6 +591,7 @@ class FTPTest < Test::Unit::TestCase
         sock = server.accept
         begin
           yield(sock)
+          sleep 0.1
         ensure
           sock.close
         end