diff --git a/ChangeLog b/ChangeLog
index 27a3b8c122..34e46546f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 30 13:27:40 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (Net::FTP#transfercmd): skip 2XX
+	  responses for some FTP servers. (backported from HEAD)
+
 Wed May 30 05:17:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_eval): get rid of SEGV at ZSUPER in a block
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index dfbcf1499f..c3059deea3 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -322,6 +322,8 @@ module Net
 	  end
 	end
 	resp = sendcmd(cmd)
+        # skip 2XX for some ftp servers
+        resp = getresp if resp[0] == ?2
 	if resp[0] != ?1
 	  raise FTPReplyError, resp
 	end
@@ -334,6 +336,8 @@ module Net
 	  end
 	end
 	resp = sendcmd(cmd)
+        # skip 2XX for some ftp servers
+        resp = getresp if resp[0] == ?2
 	if resp[0] != ?1
 	  raise FTPReplyError, resp
 	end