diff --git a/ChangeLog b/ChangeLog
index 0615966f1a..a282c5a98e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Dec 21 13:01:46 2000  Tanaka Akira  <akr@m17n.org>
+
+	* lib/net/ftp.rb (makeport): don't use TCPsocket.getaddress.
+
 Mon Dec 18 23:18:39 2000  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* util.c (mblen, __crt0_glob_function): add for multibyte
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index 7383b003c7..88361b9ddb 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -174,7 +174,7 @@ module Net
     def makeport
       sock = TCPserver.open(@sock.addr[3], 0)
       port = sock.addr[1]
-      host = TCPsocket.getaddress(@sock.addr[2])
+      host = sock.addr[3]
       resp = sendport(host, port)
       return sock
     end
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
index 06690ddebc..34d324ed12 100644
--- a/lib/net/imap.rb
+++ b/lib/net/imap.rb
@@ -22,10 +22,10 @@ Object
       port on the named host.
 
 : debug
-      Returns the debug mode
+      Returns the debug mode.
 
 : debug = val
-      Sets the debug mode
+      Sets the debug mode.
 
 : add_authenticator(auth_type, authenticator)
       Adds an authenticator for Net::IMAP#authenticate.