diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index cdc5fab46..84926b828 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,35 @@
+0.22.0
+
+musikcube:
+
+* fixed compile issues and startup crashes on Fedora, ArchLinux and openSUSE
+* fixed a bug where playback speed may be incorrect for audio files that do
+  not have exactly two channels.
+* fixed a crash that could occur in the WASAPI output plugin for audio streams
+  with very low sampling rates
+* fixed crash when parsing "TCOP" id3v2 tag (ilitirit-za)
+* fixed double-wide character truncation and ellipsizing (stephanwilliams)
+* added a new setting to disable startup update checks
+* sync'd PDCurses with the upstream repo
+
+musikdroid:
+
+* fixed a couple (relatively obscure) crashes
+* updated build environment to Android Studio Canary 8 with Support Libraries
+  26.0.0 (final)
+
+low-level:
+
+* fixed the way we define C++ flags in CMakeLists.txt so it works across more
+  platforms, e.g. FreeBSD (geier)
+* fixed GetApplicationDirectory() null termination error (mkilgore)
+* updated the way we calculate audio buffer sizes and counts to ensure there
+  is always enough headroom for audio with very low sampling rates
+* updated the mpg123 decoder so it compiles and runs again against the latest
+  version of the library and musikcube sdk.
+
+--------------------------------------------------------------------------------
+
 0.21.1
 
 * updated a few of the symbols used for drawing things like dropdowns and 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54e022a10..f43071ea9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,8 @@ cmake_minimum_required(VERSION 3.0)
 
 project(musikcube)
 set (musikcube_VERSION_MAJOR 0)
-set (musikcube_VERSION_MINOR 21)
-set (musikcube_VERSION_PATCH 1)
+set (musikcube_VERSION_MINOR 22)
+set (musikcube_VERSION_PATCH 0)
 set (musikcube_VERSION "${musikcube_VERSION_MAJOR}.${musikcube_VERSION_MINOR}.${musikcube_VERSION_PATCH}")
 
 include(CMakeToolsHelpers OPTIONAL)
diff --git a/src/musikcube/app/util/Version.h b/src/musikcube/app/util/Version.h
index d766a8c8b..e986adc0a 100644
--- a/src/musikcube/app/util/Version.h
+++ b/src/musikcube/app/util/Version.h
@@ -1,6 +1,6 @@
 #pragma once
 
 #define VERSION_MAJOR 0
-#define VERSION_MINOR 21
-#define VERSION_PATCH 1
-#define VERSION "0.21.1"
+#define VERSION_MINOR 22
+#define VERSION_PATCH 0
+#define VERSION "0.22.0"
diff --git a/src/musikcube/musikcube.rc b/src/musikcube/musikcube.rc
index 4ed33000b..4cecf5408 100644
Binary files a/src/musikcube/musikcube.rc and b/src/musikcube/musikcube.rc differ