diff --git a/ChangeLog b/ChangeLog
index 4bdc73ec7..3a9c052a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,6 @@
-20120117
- - (dtucker) [configure.ac mac.c openbsd-compat/openssl-compat.h]  Add
-   null implementation of HMAC_CTX_init for the benefit of old versions
-   of OpenSSL that don't have it.
+20120206
+ - (djm) [ssh-keygen.c] Don't fail in do_gen_all_hostkeys on platforms
+   that don't support ECC. Patch from Phil Oleson
 
 20111219
  - OpenBSD CVS Sync
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 53b232d6e..5fcd3a159 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -857,7 +857,9 @@ do_gen_all_hostkeys(struct passwd *pw)
 		{ "rsa1", "RSA1", _PATH_HOST_KEY_FILE },
 		{ "rsa", "RSA" ,_PATH_HOST_RSA_KEY_FILE },
 		{ "dsa", "DSA", _PATH_HOST_DSA_KEY_FILE },
+#ifdef OPENSSL_HAS_ECC
 		{ "ecdsa", "ECDSA",_PATH_HOST_ECDSA_KEY_FILE },
+#endif
 		{ NULL, NULL, NULL }
 	};