diff --git a/ChangeLog b/ChangeLog
index af55e6476..cbb069a97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 PolarSSL ChangeLog
 
+= Version 1.2.3 released 2012-11-26
+Bugfix
+   * Server not always sending correct CertificateRequest message
+
 = Version 1.2.2 released 2012-11-24
 Changes
    * Added p_hw_data to ssl_context for context specific hardware acceleration
diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h
index 4fe52ba30..9824692d1 100644
--- a/doxygen/input/doc_mainpage.h
+++ b/doxygen/input/doc_mainpage.h
@@ -4,7 +4,7 @@
  */
 
 /**
- * @mainpage PolarSSL v1.2.2 source code documentation
+ * @mainpage PolarSSL v1.2.3 source code documentation
  * 
  * This documentation describes the internal structure of PolarSSL.  It was
  * automatically generated from specially formatted comment blocks in
diff --git a/doxygen/polarssl.doxyfile b/doxygen/polarssl.doxyfile
index 7c3394762..cd5eef3d4 100644
--- a/doxygen/polarssl.doxyfile
+++ b/doxygen/polarssl.doxyfile
@@ -25,7 +25,7 @@ DOXYFILE_ENCODING      = UTF-8
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = "PolarSSL v1.2.2"
+PROJECT_NAME           = "PolarSSL v1.2.3"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or
diff --git a/include/polarssl/version.h b/include/polarssl/version.h
index f93238c6d..0aadd9ec5 100644
--- a/include/polarssl/version.h
+++ b/include/polarssl/version.h
@@ -39,16 +39,16 @@
  */
 #define POLARSSL_VERSION_MAJOR  1
 #define POLARSSL_VERSION_MINOR  2
-#define POLARSSL_VERSION_PATCH  2
+#define POLARSSL_VERSION_PATCH  3
 
 /**
  * The single version number has the following structure:
  *    MMNNPP00
  *    Major version | Minor version | Patch version
  */
-#define POLARSSL_VERSION_NUMBER         0x01020200
-#define POLARSSL_VERSION_STRING         "1.2.2"
-#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.2.2"
+#define POLARSSL_VERSION_NUMBER         0x01020300
+#define POLARSSL_VERSION_STRING         "1.2.3"
+#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.2.3"
 
 #if defined(POLARSSL_VERSION_C)
 
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index e420437d8..aae1f509a 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -57,7 +57,7 @@ add_library(polarssl STATIC ${src})
 else(NOT USE_SHARED_POLARSSL_LIBRARY)
 
 add_library(polarssl SHARED ${src})
-set_target_properties(polarssl PROPERTIES VERSION 1.2.2 SOVERSION 2)
+set_target_properties(polarssl PROPERTIES VERSION 1.2.3 SOVERSION 2)
 
 endif(NOT USE_SHARED_POLARSSL_LIBRARY)
 
diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index 1e5002a03..3756f582f 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -753,7 +753,7 @@ static int ssl_write_certificate_request( ssl_context *ssl )
     p += 2;
     crt = ssl->ca_chain;
 
-    total_dn_size = 2;
+    total_dn_size = 0;
     while( crt != NULL )
     {
         if( p - buf > 4096 )
@@ -767,7 +767,7 @@ static int ssl_write_certificate_request( ssl_context *ssl )
 
         SSL_DEBUG_BUF( 3, "requested DN", p, dn_size );
 
-        total_dn_size += dn_size;
+        total_dn_size += 2 + dn_size;
         crt = crt->next;
     }
 
diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data
index 3bc96b02f..f89bd9b32 100644
--- a/tests/suites/test_suite_version.data
+++ b/tests/suites/test_suite_version.data
@@ -1,5 +1,5 @@
 Check compiletime library version
-check_compiletime_version:"1.2.2"
+check_compiletime_version:"1.2.3"
 
 Check runtime library version
-check_runtime_version:"1.2.2"
+check_runtime_version:"1.2.3"