diff --git a/ChangeLog b/ChangeLog
index 0744030d3..c89a18468 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20011115
+ - (djm) Fix IPv4 default in ssh-keyscan. Spotted by Dan Astoorian 
+   <djast@cs.toronto.edu> Fix from markus@
+
 20011113
  - (djm) Fix early (and double) free of remote user when using Kerberos. 
    Patch from Simon Wilkinson <simon@sxw.org.uk>
@@ -6907,4 +6911,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1663 2001/11/13 13:05:57 djm Exp $
+$Id: ChangeLog,v 1.1664 2001/11/14 21:40:45 djm Exp $
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 520491392..3fbe88d56 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -36,7 +36,11 @@ RCSID("$OpenBSD: ssh-keyscan.c,v 1.30 2001/10/08 19:05:05 markus Exp $");
 
 /* Flag indicating whether IPv4 or IPv6.  This can be set on the command line.
    Default value is AF_UNSPEC means both IPv4 and IPv6. */
+#ifdef IPV4_DEFAULT
+int IPv4or6 = AF_INET;
+#else
 int IPv4or6 = AF_UNSPEC;
+#endif
 
 int ssh_port = SSH_DEFAULT_PORT;