2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c019c0e83..29555355f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,10 @@
    - markus@cvs.openbsd.org 2013/12/09 11:08:17
      [crypto_api.h]
      remove unused defines
+   - pascal@cvs.openbsd.org 2013/12/15 18:17:26
+     [ssh-add.c]
+     Make ssh-add also add .ssh/id_ed25519; fixes lie in manual page.
+     ok markus@
 
 20131208
  - (djm) [openbsd-compat/bsd-setres_id.c] Missing header; from Corinna
diff --git a/ssh-add.c b/ssh-add.c
index 5e8166f66..896584482 100644
--- a/ssh-add.c
+++ b/ssh-add.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.106 2013/05/17 00:13:14 djm Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.107 2013/12/15 18:17:26 pascal Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -73,6 +73,7 @@ static char *default_files[] = {
 #ifdef OPENSSL_HAS_ECC
         _PATH_SSH_CLIENT_ID_ECDSA,
 #endif
+        _PATH_SSH_CLIENT_ID_ED25519,
         _PATH_SSH_CLIENT_IDENTITY,
         NULL
 };