diff --git a/ChangeLog b/ChangeLog
index f87f1e1ce..9b438b130 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 mbed TLS ChangeLog (Sorted per branch, date)
 
-= PolarSSL 2.0 branch
+= mbed TLS 2.0.0 released 2015-07-13
 
 Features
    * Support for DTLS 1.0 and 1.2 (RFC 6347).
diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h
index 578567b38..6ef029a81 100644
--- a/doxygen/input/doc_mainpage.h
+++ b/doxygen/input/doc_mainpage.h
@@ -4,7 +4,7 @@
  */
 
 /**
- * @mainpage mbed TLS v1.4.0 source code documentation
+ * @mainpage mbed TLS v2.0.0 source code documentation
  *
  * This documentation describes the internal structure of mbed TLS.  It was
  * automatically generated from specially formatted comment blocks in
diff --git a/doxygen/mbedtls.doxyfile b/doxygen/mbedtls.doxyfile
index 2d9f66fba..4c3c5610d 100644
--- a/doxygen/mbedtls.doxyfile
+++ b/doxygen/mbedtls.doxyfile
@@ -28,7 +28,7 @@ DOXYFILE_ENCODING      = UTF-8
 # identify the project. Note that if you do not use Doxywizard you need
 # to put quotes around the project name if it contains spaces.
 
-PROJECT_NAME           = "mbed TLS v1.4.0"
+PROJECT_NAME           = "mbed TLS v2.0.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
diff --git a/include/mbedtls/version.h b/include/mbedtls/version.h
index e9621ea0a..75bddb1f6 100644
--- a/include/mbedtls/version.h
+++ b/include/mbedtls/version.h
@@ -38,8 +38,8 @@
  * The version number x.y.z is split into three parts.
  * Major, Minor, Patchlevel
  */
-#define MBEDTLS_VERSION_MAJOR  1
-#define MBEDTLS_VERSION_MINOR  4
+#define MBEDTLS_VERSION_MAJOR  2
+#define MBEDTLS_VERSION_MINOR  0
 #define MBEDTLS_VERSION_PATCH  0
 
 /**
@@ -47,9 +47,9 @@
  *    MMNNPP00
  *    Major version | Minor version | Patch version
  */
-#define MBEDTLS_VERSION_NUMBER         0x01040000
-#define MBEDTLS_VERSION_STRING         "1.4.0"
-#define MBEDTLS_VERSION_STRING_FULL    "mbed TLS 1.4.0"
+#define MBEDTLS_VERSION_NUMBER         0x02000000
+#define MBEDTLS_VERSION_STRING         "2.0.0"
+#define MBEDTLS_VERSION_STRING_FULL    "mbed TLS 2.0.0"
 
 #if defined(MBEDTLS_VERSION_C)
 
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 7f122485c..d2a29c5b3 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -138,15 +138,15 @@ endif(USE_STATIC_MBEDTLS_LIBRARY)
 
 if(USE_SHARED_MBEDTLS_LIBRARY)
     add_library(mbedcrypto SHARED ${src_crypto})
-    set_target_properties(mbedcrypto PROPERTIES VERSION 1.4.0 SOVERSION 0)
+    set_target_properties(mbedcrypto PROPERTIES VERSION 2.0.0 SOVERSION 0)
     target_link_libraries(mbedcrypto ${libs})
 
     add_library(mbedx509 SHARED ${src_x509})
-    set_target_properties(mbedx509 PROPERTIES VERSION 1.4.0 SOVERSION 0)
+    set_target_properties(mbedx509 PROPERTIES VERSION 2.0.0 SOVERSION 0)
     target_link_libraries(mbedx509 ${libs} mbedcrypto)
 
     add_library(mbedtls SHARED ${src_tls})
-    set_target_properties(mbedtls PROPERTIES VERSION 1.4.0 SOVERSION 8)
+    set_target_properties(mbedtls PROPERTIES VERSION 2.0.0 SOVERSION 10)
     target_link_libraries(mbedtls ${libs} mbedx509)
 
     install(TARGETS mbedtls mbedx509 mbedcrypto
diff --git a/library/Makefile b/library/Makefile
index 5e8236ebd..56d53264d 100644
--- a/library/Makefile
+++ b/library/Makefile
@@ -31,7 +31,7 @@ LOCAL_CFLAGS += -fPIC -fpic
 endif
 endif
 
-SOEXT_TLS=so.8
+SOEXT_TLS=so.10
 SOEXT_X509=so.0
 SOEXT_CRYPTO=so.0
 
diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data
index 4e05401dc..1917f761b 100644
--- a/tests/suites/test_suite_version.data
+++ b/tests/suites/test_suite_version.data
@@ -1,8 +1,8 @@
 Check compiletime library version
-check_compiletime_version:"1.4.0"
+check_compiletime_version:"2.0.0"
 
 Check runtime library version
-check_runtime_version:"1.4.0"
+check_runtime_version:"2.0.0"
 
 Check for MBEDTLS_VERSION_C
 check_feature:"MBEDTLS_VERSION_C":0