diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3fd0465d6..2bc31c2c6 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,19 @@
+0.12.1
+
+user-facing:
+
+* huge update to `musikdroid` -- it is now able to stream music  from any
+  `musikbox` installation! see settings > playback mode.
+* added cddb (actually, freedb) lookup for audio CDs
+* added new "add to beginning of play queue" and "play album" context menu
+  options
+
+low-level:
+
+* fixed database upsert logic to be faster and more reliable
+
+--------------------------------------------------------------------------------
+
 0.12.0
 
 user-facing:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f25dd73d3..20d9591ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ cmake_minimum_required(VERSION 3.0)
 project(musikbox)
 set (musikbox_VERSION_MAJOR 0)
 set (musikbox_VERSION_MINOR 12)
-set (musikbox_VERSION_PATCH 0)
+set (musikbox_VERSION_PATCH 1)
 set (musikbox_VERSION "${musikbox_VERSION_MAJOR}.${musikbox_VERSION_MINOR}.${musikbox_VERSION_PATCH}")
 
 include(ExternalProject)
diff --git a/src/musikbox/musikbox.rc b/src/musikbox/musikbox.rc
index b54a3d477..fde4b2be4 100644
Binary files a/src/musikbox/musikbox.rc and b/src/musikbox/musikbox.rc differ
diff --git a/src/musikdroid/app/build.gradle b/src/musikdroid/app/build.gradle
index 273a5a9ac..ac09edd97 100644
--- a/src/musikdroid/app/build.gradle
+++ b/src/musikdroid/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "io.casey.musikcube.remote"
         minSdkVersion 16
         targetSdkVersion 25
-        versionCode 3
-        versionName "0.2.0"
+        versionCode 4
+        versionName "0.5.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }