diff --git a/ChangeLog b/ChangeLog
index a4a75e57b..5b4cfc717 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,9 @@
      [ssh.c sshconnect.c sshconnect.h sshd.c sshpty.c sshpty.h uidswap.c]
      [uidswap.h]
      move #include <pwd.h> out of includes.h; ok markus@
+   - stevesk@cvs.openbsd.org 2006/07/06 16:22:39
+     [ssh-keygen.c]
+     move #include "dns.h" up
 
 20060706
  - (dtucker) [configure.ac] Try AIX blibpath test in different order when
@@ -4783,4 +4786,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.4371 2006/07/10 10:53:08 djm Exp $
+$Id: ChangeLog,v 1.4372 2006/07/10 10:53:31 djm Exp $
diff --git a/ssh-keygen.c b/ssh-keygen.c
index b10e42ec8..aa2030ea7 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.145 2006/07/06 16:03:53 stevesk Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.146 2006/07/06 16:22:39 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -35,11 +35,11 @@
 #include "misc.h"
 #include "match.h"
 #include "hostfile.h"
+#include "dns.h"
 
 #ifdef SMARTCARD
 #include "scard.h"
 #endif
-#include "dns.h"
 
 /* Number of bits in the RSA/DSA key.  This value can be set on the command line. */
 #define DEFAULT_BITS		2048