diff --git a/ChangeLog b/ChangeLog
index 9330c8057..26dfabde6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 20140822
  - (djm) [configure.ac] include leading zero characters in OpenSSL version
    number; fixes test for unsupported versions
+ - (djm) [sshbuf-getput-crypto.c] Fix compilation when OpenSSL lacks ECC
 
 20140821
  - (djm) [Makefile.in] fix reference to libtest_helper.a in sshkey test too.
diff --git a/sshbuf-getput-crypto.c b/sshbuf-getput-crypto.c
index cfe6f7963..74351d3e5 100644
--- a/sshbuf-getput-crypto.c
+++ b/sshbuf-getput-crypto.c
@@ -24,7 +24,9 @@
 #include <string.h>
 
 #include <openssl/bn.h>
-#include <openssl/ec.h>
+#ifdef OPENSSL_HAS_ECC
+# include <openssl/ec.h>
+#endif /* OPENSSL_HAS_ECC */
 
 #include "ssherr.h"
 #include "sshbuf.h"