diff --git a/ChangeLog b/ChangeLog
index 2cef209743..9f749da424 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Sep  3 06:24:38 2006  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (ruby_connect): sockerrlen should be socklen_t.
+
 Sun Sep  3 04:40:42 2006  Tanaka Akira  <akr@fsij.org>
 
 	* ext/socket/extconf.rb: check arpa/inet.h for ntohs.
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index bb462f2fb3..d5a3593fa7 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -1071,7 +1071,8 @@ ruby_connect(int fd, struct sockaddr *sockaddr, int len, int socks)
     int mode;
 #if WAIT_IN_PROGRESS > 0
     int wait_in_progress = -1;
-    int sockerr, sockerrlen;
+    int sockerr;
+    socklen_t sockerrlen;
 #endif
 
 #if defined(HAVE_FCNTL)