diff --git a/ChangeLog b/ChangeLog
index 694cfc3..1d1edf7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,6 @@
 PolarSSL ChangeLog (Sorted per branch, date)
 
-ABI Alert: ALPN changes the ABI for the next release.
-
-= PolarSSL 1.3 branch
+= PolarSSL 1.3.6 released on 2014-04-11
 
 Features
    * Support for the ALPN SSL extension
diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h
index c2f7ace..bf651c9 100644
--- a/doxygen/input/doc_mainpage.h
+++ b/doxygen/input/doc_mainpage.h
@@ -4,7 +4,7 @@
  */
 
 /**
- * @mainpage PolarSSL v1.3.5 source code documentation
+ * @mainpage PolarSSL v1.3.6 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 4fd96c1..9aa19f1 100644
--- a/doxygen/polarssl.doxyfile
+++ b/doxygen/polarssl.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           = "PolarSSL v1.3.5"
+PROJECT_NAME           = "PolarSSL v1.3.6"
 
 # 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 89af970..7e9d2ea 100644
--- a/include/polarssl/version.h
+++ b/include/polarssl/version.h
@@ -39,16 +39,16 @@
  */
 #define POLARSSL_VERSION_MAJOR  1
 #define POLARSSL_VERSION_MINOR  3
-#define POLARSSL_VERSION_PATCH  5
+#define POLARSSL_VERSION_PATCH  6
 
 /**
  * The single version number has the following structure:
  *    MMNNPP00
  *    Major version | Minor version | Patch version
  */
-#define POLARSSL_VERSION_NUMBER         0x01030500
-#define POLARSSL_VERSION_STRING         "1.3.5"
-#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.3.5"
+#define POLARSSL_VERSION_NUMBER         0x01030600
+#define POLARSSL_VERSION_STRING         "1.3.6"
+#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.3.6"
 
 #if defined(POLARSSL_VERSION_C)
 
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index cdc1069..19d1a2a 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -108,7 +108,7 @@
 
 if(USE_SHARED_POLARSSL_LIBRARY)
 	add_library(polarssl SHARED ${src})
-	set_target_properties(polarssl PROPERTIES VERSION 1.3.5 SOVERSION 5)
+	set_target_properties(polarssl PROPERTIES VERSION 1.3.6 SOVERSION 6)
 
 	target_link_libraries(polarssl ${libs})
 
diff --git a/library/Makefile b/library/Makefile
index a4a3ce7..251a682 100644
--- a/library/Makefile
+++ b/library/Makefile
@@ -22,9 +22,9 @@
 CFLAGS += -fPIC
 endif
 
-SONAME=libpolarssl.so.5
+SONAME=libpolarssl.so.6
 
-DLEXT=so.5
+DLEXT=so.6
 # OSX shared library extension:
 # DLEXT=dylib
 
diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data
index a575e64..1691e81 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.3.5"
+check_compiletime_version:"1.3.6"
 
 Check runtime library version
-check_runtime_version:"1.3.5"
+check_runtime_version:"1.3.6"