diff --git a/ChangeLog b/ChangeLog
index 0333ba30d..2f6d02306 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,9 @@
    - jmc@cvs.openbsd.org 2004/06/26 09:14:40
      [sshd_config.5]
      new sentence, new line;
+   - avsm@cvs.openbsd.org 2004/06/26 20:07:16
+     [sshd.c]
+     initialise some fd variables to -1, djm@ ok
 
 20040627
  - (tim) update README files.
@@ -1459,4 +1462,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3461 2004/06/30 12:39:34 djm Exp $
+$Id: ChangeLog,v 1.3462 2004/06/30 12:40:20 djm Exp $
diff --git a/sshd.c b/sshd.c
index e5f54cbe6..101419bed 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.296 2004/06/25 18:43:36 djm Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.297 2004/06/26 20:07:16 avsm Exp $");
 
 #include <openssl/dh.h>
 #include <openssl/bn.h>
@@ -874,7 +874,8 @@ main(int ac, char **av)
 {
 	extern char *optarg;
 	extern int optind;
-	int opt, sock_in = 0, sock_out = 0, newsock, j, i, fdsetsz, on = 1;
+	int opt, j, i, fdsetsz, on = 1;
+	int sock_in = -1, sock_out = -1, newsock = -1;
 	pid_t pid;
 	socklen_t fromlen;
 	fd_set *fdset;