diff --git a/CHANGELOG b/CHANGELOG
index e9f641cc1..2ffae8798 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,16 @@
+2.0 Alpha 6 (2014-04-06)
+=========================
+
+- Add option to lock databases after user inactivity [#62]
+- Add compatibility with libgcrypt 1.6 [#129]
+- Display passwords in monospace font [#51]
+- Use an icon for the button that shows/masks passwords [#38]
+- Add an option to show passwords by default [#93]
+- Improve password generator design [#122]
+- On Linux link .kdbx files with KeePassX
+- Remember window size [#154]
+- Disallow global auto-typing when the database is locked
+
 2.0 Alpha 5 (2013-12-20)
 =========================
 
@@ -42,7 +55,6 @@
 - Sortable entry view
 - Support building Mac OS X bundles
 
-
 2.0 Alpha 1 (2012-05-07)
 =========================
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0c2d025b..35642ebcf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,8 +34,8 @@ option(WITH_GUI_TESTS "Enable building of GUI tests" OFF)
 option(WITH_LTO "Enable Link Time Optimization (LTO)" OFF)
 option(WITH_CXX11 "Build with the C++ 11 standard" OFF)
 
-set(KEEPASSX_VERSION "2.0 alpha 5")
-set(KEEPASSX_VERSION_NUM "1.9.84")
+set(KEEPASSX_VERSION "2.0 alpha 6")
+set(KEEPASSX_VERSION_NUM "1.9.85")
 
 if("${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
   set(CMAKE_COMPILER_IS_CLANG 1)