diff --git a/CHANGELOG b/CHANGELOG
index 8418ee7bf..13194ac71 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+2.0.2 (2016-02-02)
+=========================
+
+- Fix regression in database writer that caused it to strip certain special
+  chracters (characters from Unicode plane > 0).
+- Fix bug in repair function that caused it to strip non-ASCII characters.
+
 2.0.1 (2016-01-31)
 =========================
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b8899801..6df550325 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,8 +33,8 @@ option(WITH_TESTS "Enable building of unit tests" ON)
 option(WITH_GUI_TESTS "Enable building of GUI tests" OFF)
 option(WITH_CXX11 "Build with the C++ 11 standard" ON)
 
-set(KEEPASSX_VERSION "2.0.1")
-set(KEEPASSX_VERSION_NUM "2.0.1")
+set(KEEPASSX_VERSION "2.0.2")
+set(KEEPASSX_VERSION_NUM "2.0.2")
 
 if("${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
   set(CMAKE_COMPILER_IS_CLANG 1)