2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index d4558ea15..af1c8b1e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@
    - jmc@cvs.openbsd.org 2010/08/31 21:14:58
      [ssh.1]
      small text tweak to accommodate previous;
+   - naddy@cvs.openbsd.org 2010/09/01 15:21:35
+     [servconf.c]
+     pick up ECDSA host key by default; ok djm@
 
 20100831
  - OpenBSD CVS Sync
diff --git a/servconf.c b/servconf.c
index 986a5b92f..def6b716a 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.209 2010/06/22 04:22:59 djm Exp $ */
+/* $OpenBSD: servconf.c,v 1.210 2010/09/01 15:21:35 naddy Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -154,6 +154,8 @@ fill_default_server_options(ServerOptions *options)
                             _PATH_HOST_RSA_KEY_FILE;
                         options->host_key_files[options->num_host_key_files++] =
                             _PATH_HOST_DSA_KEY_FILE;
+                        options->host_key_files[options->num_host_key_files++] =
+                            _PATH_HOST_ECDSA_KEY_FILE;
                 }
         }
         /* No certificates by default */