diff --git a/ChangeLog b/ChangeLog
index 09e3f192b..a033e905f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -108,6 +108,9 @@
    - stevesk@cvs.openbsd.org 2001/06/29 18:38:44
      [clientloop.c]
      sync function definition with declaration; ok markus@
+   - stevesk@cvs.openbsd.org 2001/06/29 18:40:28
+     [channels.c]
+     use socklen_t for getsockopt arg #5; ok markus@
  
 20010629
  - (bal) Removed net_aton() since we don't use it any more
@@ -5935,4 +5938,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1370 2001/07/04 05:10:27 mouring Exp $
+$Id: ChangeLog,v 1.1371 2001/07/04 05:13:35 mouring Exp $
diff --git a/channels.c b/channels.c
index 2721ec6bc..937e059cc 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.128 2001/06/25 08:25:35 markus Exp $");
+RCSID("$OpenBSD: channels.c,v 1.129 2001/06/29 18:40:28 stevesk Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -1142,7 +1142,7 @@ static void
 channel_post_connecting(Channel *c, fd_set * readset, fd_set * writeset)
 {
 	int err = 0;
-	int sz = sizeof(err);
+	socklen_t sz = sizeof(err);
 
 	if (FD_ISSET(c->sock, writeset)) {
 		if (getsockopt(c->sock, SOL_SOCKET, SO_ERROR, (char *)&err,