diff --git a/Changelog b/Changelog
index 6d100029b..8b4456523 100644
--- a/Changelog
+++ b/Changelog
@@ -2,9 +2,19 @@ Strawberry Music Player
 =======================
 ChangeLog
 
+Version 0.2.1:
+
+    * Fixed crash with newer Qt
+    * Fixed setting output/device for Xine and VLC backend
+    * Improved backend settings to better support multiple backends
+    * Fixed track slider for Xine, VLC and Phonon
+    * Fixed compilation on MacOs
+    * Fixed device selection on MacOs
+    * Added xine on to windows build
+
 Version 0.1.6:
-    * Fix crash on exit caused by NVIDIA driver
-    * Fix PulseAudio device selection
+    * Fixed crash on exit caused by NVIDIA driver
+    * Fixed PulseAudio device selection
     * Improvements to device selection
 
 Version 0.1.5:
diff --git a/cmake/Version.cmake b/cmake/Version.cmake
index 1301e245a..33bbfad58 100644
--- a/cmake/Version.cmake
+++ b/cmake/Version.cmake
@@ -1,9 +1,9 @@
 set(STRAWBERRY_VERSION_MAJOR 0)
-set(STRAWBERRY_VERSION_MINOR 1)
-set(STRAWBERRY_VERSION_PATCH 6)
+set(STRAWBERRY_VERSION_MINOR 2)
+set(STRAWBERRY_VERSION_PATCH 1)
 #set(STRAWBERRY_VERSION_PRERELEASE rc1)
 
-set(INCLUDE_GIT_REVISION ON)
+set(INCLUDE_GIT_REVISION OFF)
 
 if (WIN32)
   set(INCLUDE_GIT_REVISION OFF)
diff --git a/dist/windows/strawberry.nsi b/dist/windows/strawberry.nsi
index 73264b264..5892c4944 100644
--- a/dist/windows/strawberry.nsi
+++ b/dist/windows/strawberry.nsi
@@ -1,10 +1,10 @@
 !define PRODUCT_NAME "Strawberry"
 !define PRODUCT_PUBLISHER "Strawberry"
 !define PRODUCT_VERSION_MAJOR 0
-!define PRODUCT_VERSION_MINOR 1
-!define PRODUCT_VERSION_PATCH 7
-!define PRODUCT_DISPLAY_VERSION "0.1.7"
-!define PRODUCT_DISPLAY_VERSION_SHORT "0.1.7"
+!define PRODUCT_VERSION_MINOR 2
+!define PRODUCT_VERSION_PATCH 1
+!define PRODUCT_DISPLAY_VERSION "0.2.1"
+!define PRODUCT_DISPLAY_VERSION_SHORT "0.2.1"
 !define PRODUCT_WEB_SITE "http://www.strawbs.org/"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
@@ -48,7 +48,7 @@ SetCompressor /SOLID lzma
 !insertmacro MUI_LANGUAGE "English" ;first language is the default language
 
 Name "${PRODUCT_NAME}"
-OutFile "${PRODUCT_NAME}Setup-0.1.7.exe"
+OutFile "${PRODUCT_NAME}Setup-0.2.1.exe"
 InstallDir "${PRODUCT_INSTALL_DIR}"
 
 ; Get the path where Strawberry was installed previously and set it as default path