diff --git a/ChangeLog b/ChangeLog
index 134a37162..318d5d3fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,11 @@
    - jmc@cvs.openbsd.org 2010/09/04 09:38:34
      [ssh-add.1 ssh.1]
      two more EXIT STATUS sections;
+   - naddy@cvs.openbsd.org 2010/09/06 17:10:19
+     [sshd_config]
+     add ssh_host_ecdsa_key to /etc; from Mattieu Baptiste
+     <mattieu.b@gmail.com>
+     ok deraadt@
 
 20100831
  - OpenBSD CVS Sync
diff --git a/sshd_config b/sshd_config
index 72fbae37b..4534841c1 100644
--- a/sshd_config
+++ b/sshd_config
@@ -1,4 +1,4 @@
-#	$OpenBSD: sshd_config,v 1.81 2009/10/08 14:03:41 markus Exp $
+#	$OpenBSD: sshd_config,v 1.82 2010/09/06 17:10:19 naddy Exp $
 
 # This is the sshd server system-wide configuration file.  See
 # sshd_config(5) for more information.
@@ -23,6 +23,7 @@
 # HostKeys for protocol version 2
 #HostKey /etc/ssh/ssh_host_rsa_key
 #HostKey /etc/ssh/ssh_host_dsa_key
+#HostKey /etc/ssh/ssh_host_ecdsa_key
 
 # Lifetime and size of ephemeral version 1 server key
 #KeyRegenerationInterval 1h