diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ea580d0..5bb9a185 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,7 @@ option( BUILD_SHARED   "Build shared library."              OFF )
 option( BUILD_EXAMPLES "Build examples applications."       OFF )
 option( BUILD_TESTS    "Build all available test suites."   OFF )
 option( BUILD_SSL      "Build secure socket layer support."  ON )
+option( ECDHE_SUPPORT  "Support for ECDHE-based cipher suites" OFF )
 
 #
 # Configuration
@@ -32,6 +33,10 @@ if ( BUILD_SSL )
     include_directories( SYSTEM ${ssl_INCLUDE} )
 endif ( )
 
+if ( ECDHE_SUPPORT )
+    add_definitions(-DECDHE_SUPPORT)
+endif ( ECDHE_SUPPORT )
+
 #
 # Build
 #
diff --git a/example/https_service/source/example.cpp b/example/https_service/source/example.cpp
index 075adb99..0afc0ced 100644
--- a/example/https_service/source/example.cpp
+++ b/example/https_service/source/example.cpp
@@ -37,7 +37,11 @@ int main( const int, const char** )
     ssl_settings->set_http_disabled( true );
     ssl_settings->set_private_key( Uri( "file:///tmp/server.key" ) );
     ssl_settings->set_certificate( Uri( "file:///tmp/server.crt" ) );
+#ifndef ECDHE_SUPPORT
     ssl_settings->set_temporary_diffie_hellman( Uri( "file:///tmp/dh768.pem" ) );
+#else
+    ssl_settings->set_temporary_ecc_diffie_hellman(true);
+#endif
     
     auto settings = make_shared< Settings >( );
     settings->set_ssl_settings( ssl_settings );
diff --git a/source/corvusoft/restbed/detail/service_impl.cpp b/source/corvusoft/restbed/detail/service_impl.cpp
index 518d7a9e..d868bda8 100644
--- a/source/corvusoft/restbed/detail/service_impl.cpp
+++ b/source/corvusoft/restbed/detail/service_impl.cpp
@@ -244,6 +244,13 @@ namespace restbed
                 options = ( m_ssl_settings->has_enabled_single_diffie_hellman_use( ) ) ? options | asio::ssl::context::single_dh_use : options;
                 m_ssl_context->set_options( options );
                 
+#ifdef ECDHE_SUPPORT
+                if ( m_ssl_settings->has_enabled_ecc_diffie_hellman_use() )
+                {
+                    m_ssl_context->use_tmp_ecdh(m_ssl_settings->get_certificate());
+                }
+#endif
+
                 if ( not m_ssl_settings->get_bind_address( ).empty( ) )
                 {
                     const auto address = address::from_string( m_ssl_settings->get_bind_address( ) );
diff --git a/source/corvusoft/restbed/detail/ssl_settings_impl.hpp b/source/corvusoft/restbed/detail/ssl_settings_impl.hpp
index 54ba992d..0b30a1de 100644
--- a/source/corvusoft/restbed/detail/ssl_settings_impl.hpp
+++ b/source/corvusoft/restbed/detail/ssl_settings_impl.hpp
@@ -49,6 +49,10 @@ namespace restbed
             bool m_default_workarounds_enabled = true;
             
             bool m_single_diffie_hellman_use_enabled = true;
+
+#ifdef ECDHE_SUPPORT
+            bool m_ecc_diffie_hellman_use_enabled = false;
+#endif
             
             std::string m_bind_address = "";
             
@@ -65,6 +69,10 @@ namespace restbed
             std::string m_certificate_authority_pool = "";
             
             std::string m_temporary_diffie_hellman = "";
+
+#ifdef ECDHE_SUPPORT
+            std::string m_temporary_ecc_diffie_hellman = "";
+#endif
         };
     }
 }
diff --git a/source/corvusoft/restbed/ssl_settings.cpp b/source/corvusoft/restbed/ssl_settings.cpp
index fa6e21d1..1423ccda 100644
--- a/source/corvusoft/restbed/ssl_settings.cpp
+++ b/source/corvusoft/restbed/ssl_settings.cpp
@@ -76,6 +76,13 @@ namespace restbed
     {
         return m_pimpl->m_single_diffie_hellman_use_enabled;
     }
+
+#ifdef ECDHE_SUPPORT
+    bool SSLSettings::has_enabled_ecc_diffie_hellman_use( void ) const
+    {
+        return m_pimpl->m_ecc_diffie_hellman_use_enabled;
+    }
+#endif
     
     uint16_t SSLSettings::get_port( void ) const
     {
@@ -176,6 +183,13 @@ namespace restbed
     {
         m_pimpl->m_single_diffie_hellman_use_enabled = value;
     }
+
+#ifdef ECDHE_SUPPORT
+    void SSLSettings::set_ecc_diffie_hellman_use_enabled( const bool value )
+    {
+        m_pimpl->m_ecc_diffie_hellman_use_enabled = value;
+    }
+#endif
     
     void SSLSettings::set_certificate( const Uri& value )
     {
@@ -211,4 +225,5 @@ namespace restbed
     {
         m_pimpl->m_temporary_diffie_hellman = String::remove( "file://", value.to_string( ), String::CASE_INSENSITIVE );
     }
+
 }
diff --git a/source/corvusoft/restbed/ssl_settings.hpp b/source/corvusoft/restbed/ssl_settings.hpp
index d4adcaa7..d56ded44 100644
--- a/source/corvusoft/restbed/ssl_settings.hpp
+++ b/source/corvusoft/restbed/ssl_settings.hpp
@@ -59,6 +59,9 @@ namespace restbed
             bool has_enabled_default_workarounds( void ) const;
             
             bool has_enabled_single_diffie_hellman_use( void ) const;
+#ifdef ECDHE_SUPPORT
+            bool has_enabled_ecc_diffie_hellman_use( void ) const;
+#endif
             
             //Getters
             uint16_t get_port( void ) const;
@@ -115,6 +118,9 @@ namespace restbed
             void set_private_rsa_key( const Uri& value );
             
             void set_temporary_diffie_hellman( const Uri& value );
+#ifdef ECDHE_SUPPORT
+            void set_ecc_diffie_hellman_use_enabled( bool value );
+#endif
             
             //Operators