diff --git a/openssl-sys/Cargo.toml b/openssl-sys/Cargo.toml
index 0e78b0ea27596f4276eb26fc588b76d242f74ad7..5a01318c6376e69d418b634dfb7d94871007b19c 100644
--- a/openssl-sys/Cargo.toml
+++ b/openssl-sys/Cargo.toml
@@ -22,6 +22,7 @@ aes_ctr = []
 npn = []
 alpn = []
 rfc5114 = []
+ecdh_auto = []
 
 [dependencies]
 libc = "0.1"
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index 3f5f762381acbf7052948f34fa4ab5cb4cf66980..45d03ac8e16e1e7bcee0d6d10608350174585821 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -675,6 +675,9 @@ extern "C" {
     pub fn SSL_CTX_add_extra_chain_cert(ctx: *mut SSL_CTX, x509: *mut X509) -> c_long;
     #[link_name = "SSL_CTX_set_read_ahead_shim"]
     pub fn SSL_CTX_set_read_ahead(ctx: *mut SSL_CTX, m: c_long) -> c_long;
+    #[cfg(feature = "ecdh_auto")]
+    #[link_name = "SSL_CTX_set_ecdh_auto_shim"]
+    pub fn SSL_CTX_set_ecdh_auto(ssl: *mut SSL_CTX, onoff: c_int) -> c_int;
     #[link_name = "SSL_set_tlsext_host_name_shim"]
     pub fn SSL_set_tlsext_host_name(s: *mut SSL, name: *const c_char) -> c_long;
     #[link_name = "SSL_CTX_set_tmp_dh_shim"]
diff --git a/openssl-sys/src/openssl_shim.c b/openssl-sys/src/openssl_shim.c
index ce0ee6929dea5e7a9c3a0e192cabed83fb3f64fb..7fabe06e18d647702cdc90d0b512c45913b28d90 100644
--- a/openssl-sys/src/openssl_shim.c
+++ b/openssl-sys/src/openssl_shim.c
@@ -85,6 +85,12 @@ long SSL_CTX_set_tmp_dh_shim(SSL_CTX *ctx, DH *dh) {
     return SSL_CTX_set_tmp_dh(ctx, dh);
 }
 
+#if OPENSSL_VERSION_NUMBER >= 0x1000200L
+int SSL_CTX_set_ecdh_auto_shim(SSL_CTX *ctx, int onoff) {
+    return SSL_CTX_set_ecdh_auto(ctx, onoff);
+}
+#endif
+
 DH *DH_new_from_params(BIGNUM *p, BIGNUM *g, BIGNUM *q) {
     DH *dh;
 
diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml
index 8ade81013006d9e509de155b6c200d0722850a6e..c70c3ad3e7878793ab0268000d96db79d60e4370 100644
--- a/openssl/Cargo.toml
+++ b/openssl/Cargo.toml
@@ -20,6 +20,7 @@ aes_ctr = ["openssl-sys/aes_ctr"]
 npn = ["openssl-sys/npn"]
 alpn = ["openssl-sys/alpn"]
 rfc5114 = ["openssl-sys/rfc5114"]
+ecdh_auto = ["openssl-sys/ecdh_auto"]
 
 [dependencies.openssl-sys]
 path = "../openssl-sys"
diff --git a/openssl/src/ssl/mod.rs b/openssl/src/ssl/mod.rs
index 3adf89e634db0edac6959b0942ebb62a24fee52e..a0553b4416bc1f294448d1e8e0a66a51755050a8 100644
--- a/openssl/src/ssl/mod.rs
+++ b/openssl/src/ssl/mod.rs
@@ -570,6 +570,18 @@ impl SslContext {
             })
     }
 
+    /// If `onoff` is set to `true`, enable ECDHE for key exchange with compatible
+    /// clients, and automatically select an appropriate elliptic curve.
+    ///
+    /// This method requires OpenSSL >= 1.2.0 or LibreSSL and the `ecdh_auto` feature.
+    #[cfg(feature = "ecdh_auto")]
+    pub fn set_ecdh_auto(&mut self, onoff: bool) -> Result<(),SslError> {
+        wrap_ssl_result(
+            unsafe {
+                ffi::SSL_CTX_set_ecdh_auto(self.ctx, onoff as c_int)
+            })
+    }
+
     pub fn set_options(&mut self, option: SslContextOptions) -> SslContextOptions {
         let raw_bits = option.bits();
         let ret = unsafe {