diff --git a/ChangeLog b/ChangeLog
index aa0c2a4bc..c1b6c88d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ PolarSSL ChangeLog
 = Version Master
 Bugfix
    * Memory leak when using RSA_PKCS_V21 operations fixed
+   * Handle future version properly in ssl_write_certificate_request()
 
 = Version 1.2.3 released 2012-11-26
 Bugfix
diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index 3756f582f..38253933a 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -731,7 +731,7 @@ static int ssl_write_certificate_request( ssl_context *ssl )
      *
      * Length is always 2
      */
-    if( ssl->max_minor_ver == SSL_MINOR_VERSION_3 )
+    if( ssl->minor_ver == SSL_MINOR_VERSION_3 )
     {
         ssl->handshake->verify_sig_alg = SSL_HASH_SHA256;