diff --git a/ChangeLog b/ChangeLog
index f23aee603..d4cf85b7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 mbed TLS ChangeLog (Sorted per branch, date)
 
-= mbed TLS 1.3.x branch 2016-xx-xx
+= mbed TLS 1.3.18 branch 2016-10-17
 
 Security
    * Removed the MBEDTLS_SSL_AEAD_RANDOM_IV option, because it was not compliant
diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h
index 427ce549c..efc583904 100644
--- a/doxygen/input/doc_mainpage.h
+++ b/doxygen/input/doc_mainpage.h
@@ -4,7 +4,7 @@
  */
 
 /**
- * @mainpage mbed TLS v1.3.17 source code documentation
+ * @mainpage mbed TLS v1.3.18 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 597ff59a7..3a62380e4 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.3.17"
+PROJECT_NAME           = "mbed TLS v1.3.18"
 
 # 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 6196afd19..d0ef7676b 100644
--- a/include/polarssl/version.h
+++ b/include/polarssl/version.h
@@ -40,16 +40,16 @@
  */
 #define POLARSSL_VERSION_MAJOR  1
 #define POLARSSL_VERSION_MINOR  3
-#define POLARSSL_VERSION_PATCH  17
+#define POLARSSL_VERSION_PATCH  18
 
 /**
  * The single version number has the following structure:
  *    MMNNPP00
  *    Major version | Minor version | Patch version
  */
-#define POLARSSL_VERSION_NUMBER         0x01031100
-#define POLARSSL_VERSION_STRING         "1.3.17"
-#define POLARSSL_VERSION_STRING_FULL    "mbed TLS 1.3.17"
+#define POLARSSL_VERSION_NUMBER         0x01031200
+#define POLARSSL_VERSION_STRING         "1.3.18"
+#define POLARSSL_VERSION_STRING_FULL    "mbed TLS 1.3.18"
 
 #if defined(POLARSSL_VERSION_C)
 
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index d24a6cbd8..8ccc7a391 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -117,7 +117,7 @@ endif()
 
 if(USE_SHARED_MBEDTLS_LIBRARY)
 	add_library(mbedtls SHARED ${src})
-	set_target_properties(mbedtls PROPERTIES VERSION 1.3.17 SOVERSION 9)
+	set_target_properties(mbedtls PROPERTIES VERSION 1.3.18 SOVERSION 9)
 
 	target_link_libraries(mbedtls ${libs})
 
diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data
index bc0cbb385..1b2fd9eda 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.3.17"
+check_compiletime_version:"1.3.18"
 
 Check runtime library version
-check_runtime_version:"1.3.17"
+check_runtime_version:"1.3.18"
 
 Check for POLARSSL_VERSION_C
 check_feature:"POLARSSL_VERSION_C":0