diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ac1a52a..00625b43 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,9 +18,9 @@ set(APPLICATION_DESCRIPTION "Cross platform XMPP client")
 
 # Version
 set(VERSION_MAJOR 0)
-set(VERSION_MINOR 3)
-set(VERSION_PATCH 0)
-set(VERSION_EXTRA "dev")
+set(VERSION_MINOR 2)
+set(VERSION_PATCH 3)
+#set(VERSION_EXTRA "dev")
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 if(VERSION_EXTRA)
 	set(VERSION_STRING ${VERSION_STRING}-${VERSION_EXTRA})
diff --git a/changelog.md b/changelog.md
index 479fd12f..7230906c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,10 @@
 # Changelog
 
+### Version 0.2.3 (released on 19.06.2017)
+Fixes:
+ * LoginPage: Remove material shadow (#113) (@JBBgameich)
+ * Kaidan was crashing since v0.2.2 when inserting a new message to the DB (@LNJ2)
+
 ### Version 0.2.2 (released on 19.06.2017)
 Fixes:
  * RosterPage: Clear TextFields after closing AddContactSheet (#106) (@JBBgameich)