diff --git a/ChangeLog b/ChangeLog
index e59e4dec8..e9e9cd2fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 PolarSSL ChangeLog
 
-= Version Trunk
+= Version 1.2.0 released 2012-10-31
 Features
    * Added support for NULL cipher (POLARSSL_CIPHER_NULL_CIPHER) and weak
      ciphersuites (POLARSSL_ENABLE_WEAK_CIPHERSUITES). They are disabled by
@@ -18,7 +18,7 @@ Features
    * Added commandline error code convertor (util/strerror)
    * Added support for Hardware Acceleration hooking in SSL/TLS
    * Added OpenSSL / PolarSSL compatibility script (tests/compat.sh) and
-     example application (programs/ssl/o_p_test) (Requires OpenSSL)
+     example application (programs/ssl/o_p_test) (requires OpenSSL)
    * Added X509 CA Path support
    * Added Thumb assembly optimizations
    * Added DEFLATE compression support as per RFC3749 (requires zlib)
@@ -65,10 +65,6 @@ Bugfix
    * Fixed MPI assembly for SPARC64 platform
 
 Security
-   * Fixed potential memory corruption on miscrafted client messages (found by
-     Frama-C team at CEA LIST)
-   * Fixed generation of DHM parameters to correct length (found by Ruslan
-     Yushchenko)
    * Fixed potential memory zeroization on miscrafted RSA key (found by Eloi
      Vanderbeken)
 
diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h
index 456b5e617..c44084055 100644
--- a/doxygen/input/doc_mainpage.h
+++ b/doxygen/input/doc_mainpage.h
@@ -4,7 +4,7 @@
  */
 
 /**
- * @mainpage PolarSSL v1.1.1 source code documentation
+ * @mainpage PolarSSL v1.2.0 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 41cb6e0fb..90fd2a3eb 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.1.1"
+PROJECT_NAME           = "PolarSSL v1.2.0"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or