diff --git a/ChangeLog b/ChangeLog
index 9485cacd8..23eb1a020 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ Bugfix
    * ssl_parse_certificate() now calls x509parse_crt_der() directly
      instead of the x509parse_crt() wrapper that can also parse PEM
 	 certificates
+   * Fixed values for 2-key Triple DES in cipher layer
 
 = Version 1.1.6 released on 2013-03-11
 Bugfix
diff --git a/library/cipher_wrap.c b/library/cipher_wrap.c
index 8edc06f37..48f6a0015 100644
--- a/library/cipher_wrap.c
+++ b/library/cipher_wrap.c
@@ -522,8 +522,8 @@ const cipher_info_t des_ede_cbc_info = {
     POLARSSL_MODE_CBC,
     POLARSSL_KEY_LENGTH_DES_EDE,
     "DES-EDE-CBC",
-    16,
-    16,
+    8,
+    8,
     &des_ede_info
 };