diff --git a/ChangeLog b/ChangeLog
index b31c4f4..fc4b612 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 PolarSSL ChangeLog
 
-= Version trunk
+= Version 1.0.0 released on 2011-07-27
 Features
    * Expanded cipher layer with support for CFB128 and CTR mode
 
diff --git a/doxygen/input/doc_mainpage.h b/doxygen/input/doc_mainpage.h
index e3e36a4..db76973 100644
--- a/doxygen/input/doc_mainpage.h
+++ b/doxygen/input/doc_mainpage.h
@@ -4,7 +4,7 @@
  */
 
 /**
- * @mainpage PolarSSL v0.99-pre5 source code documentation
+ * @mainpage PolarSSL v1.0.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 c1c6b46..a1395fc 100644
--- a/doxygen/polarssl.doxyfile
+++ b/doxygen/polarssl.doxyfile
@@ -25,7 +25,7 @@
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = "PolarSSL v0.99-pre5"
+PROJECT_NAME           = "PolarSSL v1.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/polarssl/version.h b/include/polarssl/version.h
index 319f85a..03a55ce 100644
--- a/include/polarssl/version.h
+++ b/include/polarssl/version.h
@@ -37,18 +37,18 @@
  * The version number x.y.z is split into three parts.
  * Major, Minor, Patchlevel
  */
-#define POLARSSL_VERSION_MAJOR  0
-#define POLARSSL_VERSION_MINOR  99
-#define POLARSSL_VERSION_PATCH  5
+#define POLARSSL_VERSION_MAJOR  1
+#define POLARSSL_VERSION_MINOR  0
+#define POLARSSL_VERSION_PATCH  0
 
 /**
  * The single version number has the following structure:
  *    MMNNPP00
  *    Major version | Minor version | Patch version
  */
-#define POLARSSL_VERSION_NUMBER         0x00630500
-#define POLARSSL_VERSION_STRING         "0.99.5"
-#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 0.99.5"
+#define POLARSSL_VERSION_NUMBER         0x01000000
+#define POLARSSL_VERSION_STRING         "1.0.0"
+#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.0.0"
 
 #if defined(POLARSSL_VERSION_C)
 
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 408a4b3..3050856 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -43,7 +43,7 @@
 else(NOT USE_SHARED_POLARSSL_LIBRARY)
 
 ADD_LIBRARY(polarssl SHARED ${src})
-SET_TARGET_PROPERTIES(polarssl PROPERTIES VERSION 0.99.5 SOVERSION 0)
+SET_TARGET_PROPERTIES(polarssl PROPERTIES VERSION 1.0.0 SOVERSION 0)
 
 endif(NOT USE_SHARED_POLARSSL_LIBRARY)
 
diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data
index 0c9ffc8..2f5c188 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:"0.99.5"
+check_compiletime_version:"1.0.0"
 
 Check runtime library version
-check_runtime_version:"0.99.5"
+check_runtime_version:"1.0.0"