diff --git a/ChangeLog b/ChangeLog
index 28af3b6f41..760ee503ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Nov 18 20:30:08 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/net/ftp.rb (Net::FTP#open_socket): SOCKSsocket is obsolete.
+	  a patch from Alan Johnson <alan.wayne.johnson at gmail.com> in 
+	  [ruby-core:19982].
+
 Tue Nov 18 16:18:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/logger.rb (ProgName): fixed for svn, based on a patch from
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index d890130ce7..e07418e83e 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -152,9 +152,9 @@ module Net
     end
 
     def open_socket(host, port)
-      if defined? SOCKSsocket and ENV["SOCKS_SERVER"]
+      if defined? SOCKSSocket and ENV["SOCKS_SERVER"]
 	@passive = true
-	return SOCKSsocket.open(host, port)
+	return SOCKSSocket.open(host, port)
       else
 	return TCPSocket.open(host, port)
       end