diff --git a/ChangeLog b/ChangeLog
index 1d73308..8b9b8c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 mbed TLS ChangeLog (Sorted per branch, date)
 
-= mbed TLS 2.1.xx branch released xxxx-xx-xx
+= mbed TLS 2.1.18 branch released 2018-12-21
 
 Bugfix
    * Fix for Clang, which was reporting a warning for the bignum.c inline
diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h
index 74ff30d..1261c62 100644
--- a/doxygen/input/doc_mainpage.h
+++ b/doxygen/input/doc_mainpage.h
@@ -21,7 +21,7 @@
  */
 
 /**
- * @mainpage mbed TLS v2.1.17 source code documentation
+ * @mainpage mbed TLS v2.1.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 630daf5..4dc87fb 100644
--- a/doxygen/mbedtls.doxyfile
+++ b/doxygen/mbedtls.doxyfile
@@ -28,7 +28,7 @@
 # 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 v2.1.17"
+PROJECT_NAME           = "mbed TLS v2.1.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/mbedtls/version.h b/include/mbedtls/version.h
index ca95402..05a381d 100644
--- a/include/mbedtls/version.h
+++ b/include/mbedtls/version.h
@@ -39,16 +39,16 @@
  */
 #define MBEDTLS_VERSION_MAJOR  2
 #define MBEDTLS_VERSION_MINOR  1
-#define MBEDTLS_VERSION_PATCH  17
+#define MBEDTLS_VERSION_PATCH  18
 
 /**
  * The single version number has the following structure:
  *    MMNNPP00
  *    Major version | Minor version | Patch version
  */
-#define MBEDTLS_VERSION_NUMBER         0x02011100
-#define MBEDTLS_VERSION_STRING         "2.1.17"
-#define MBEDTLS_VERSION_STRING_FULL    "mbed TLS 2.1.17"
+#define MBEDTLS_VERSION_NUMBER         0x02011200
+#define MBEDTLS_VERSION_STRING         "2.1.18"
+#define MBEDTLS_VERSION_STRING_FULL    "mbed TLS 2.1.18"
 
 #if defined(MBEDTLS_VERSION_C)
 
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 72713cc..f7f0340 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -138,15 +138,15 @@
 
 if(USE_SHARED_MBEDTLS_LIBRARY)
     add_library(mbedcrypto SHARED ${src_crypto})
-    set_target_properties(mbedcrypto PROPERTIES VERSION 2.1.17 SOVERSION 0)
+    set_target_properties(mbedcrypto PROPERTIES VERSION 2.1.18 SOVERSION 0)
     target_link_libraries(mbedcrypto ${libs})
 
     add_library(mbedx509 SHARED ${src_x509})
-    set_target_properties(mbedx509 PROPERTIES VERSION 2.1.17 SOVERSION 0)
+    set_target_properties(mbedx509 PROPERTIES VERSION 2.1.18 SOVERSION 0)
     target_link_libraries(mbedx509 ${libs} mbedcrypto)
 
     add_library(mbedtls SHARED ${src_tls})
-    set_target_properties(mbedtls PROPERTIES VERSION 2.1.17 SOVERSION 10)
+    set_target_properties(mbedtls PROPERTIES VERSION 2.1.18 SOVERSION 10)
     target_link_libraries(mbedtls ${libs} mbedx509)
 
     install(TARGETS mbedtls mbedx509 mbedcrypto
diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data
index 588eaf9..7970404 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:"2.1.17"
+check_compiletime_version:"2.1.18"
 
 Check runtime library version
-check_runtime_version:"2.1.17"
+check_runtime_version:"2.1.18"
 
 Check for MBEDTLS_VERSION_C
 check_feature:"MBEDTLS_VERSION_C":0
diff --git a/yotta/data/module.json b/yotta/data/module.json
index 0939206..a7f68cd 100644
--- a/yotta/data/module.json
+++ b/yotta/data/module.json
@@ -1,6 +1,6 @@
 {
     "name": "mbedtls",
-    "version": "2.1.17",
+    "version": "2.1.18",
     "description": "The mbed TLS crypto/SSL/TLS library",
     "licenses": [
         {