diff --git a/ChangeLog b/ChangeLog
index b763497b44..34240178db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 20 10:55:18 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/lib/socket.rb (Addrinfo#family_addrinfo): fix a typo in
+	  error message.  patch by Nobuhiro IMAI.  [ruby-dev:38828]
+
 Sun Jul 19 22:22:54 2009  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* rational.c (float_to_r): an improvement.
diff --git a/ext/socket/lib/socket.rb b/ext/socket/lib/socket.rb
index 1f155e7813..b3b31d87f7 100644
--- a/ext/socket/lib/socket.rb
+++ b/ext/socket/lib/socket.rb
@@ -15,7 +15,7 @@ class Addrinfo
     if args.empty?
       raise ArgumentError, "no address specified"
     elsif Addrinfo === args.first
-      raise ArgumentError, "too man argument" if args.length != 1
+      raise ArgumentError, "too many arguments" if args.length != 1
     elsif self.ip?
       raise ArgumentError, "IP address needs host and port but #{args.length} arguments given" if args.length != 2
       host, port = args