diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 9492ce5..df21ecb 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -319,7 +319,8 @@
     SSL_DEBUG_MSG( 2, ( "=> parse server key exchange" ) );
 
     if( ssl->session->cipher != SSL_EDH_RSA_DES_168_SHA &&
-        ssl->session->cipher != SSL_EDH_RSA_AES_256_SHA )
+        ssl->session->cipher != SSL_EDH_RSA_AES_256_SHA &&
+	ssl->session->cipher != SSL_EDH_RSA_CAMELLIA_256_SHA)
     {
         SSL_DEBUG_MSG( 2, ( "<= skip parse server key exchange" ) );
         ssl->state++;
@@ -509,7 +510,8 @@
     SSL_DEBUG_MSG( 2, ( "=> write client key exchange" ) );
 
     if( ssl->session->cipher == SSL_EDH_RSA_DES_168_SHA ||
-        ssl->session->cipher == SSL_EDH_RSA_AES_256_SHA )
+        ssl->session->cipher == SSL_EDH_RSA_AES_256_SHA ||
+	ssl->session->cipher == SSL_EDH_RSA_CAMELLIA_256_SHA)
     {
 #if !defined(POLARSSL_DHM_C)
         SSL_DEBUG_MSG( 1, ( "support for dhm in not available" ) );