diff --git a/CHANGELOG b/CHANGELOG
index baeb5db4..1ff391c5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+2.0 Beta 2 (2015-09-06)
+=========================
+
+- Fix crash when locking with search UI open [#309]
+- Fix file locking on Mac OS X [#327]
+- Set default extension when saving a database [#79, #308]
+
 2.0 Beta 1 (2015-07-18)
 =========================
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 575ca31e..55458617 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" ON)
 
-set(KEEPASSX_VERSION "2.0 beta 1")
-set(KEEPASSX_VERSION_NUM "1.9.91")
+set(KEEPASSX_VERSION "2.0 beta 2")
+set(KEEPASSX_VERSION_NUM "1.9.92")
 
 if("${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
   set(CMAKE_COMPILER_IS_CLANG 1)