diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca0477a47..3a3e1f0b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ###Changelog
 
+####Version 0.12.1
+* Pebble: fix Morpheuz and Misfit data being associated with the wrong device and/or user in some cases causing them to invisible in charts
+* Remove special handling for Conversations notfications since upstream dropped special pebble support
+
 ####Version 0.12.0
 * NB: User action needed to migrate existing data! 
 * Store activity data per device and provider to allow multiple devices of the same kind with separate data. Migration is available, except for Pebble Misfit data. Existing data from multiple devices of the same kind (eg. multiple Mi Bands) will get merged while importing.
diff --git a/app/build.gradle b/app/build.gradle
index 61f97e769..992b3030d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         targetSdkVersion 23
 
         // note: always bump BOTH versionCode and versionName!
-        versionName "0.12.0"
-        versionCode 59
+        versionName "0.12.1"
+        versionCode 60
     }
     buildTypes {
         release {
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 6d60a53e7..ef2ae4574 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.12.1" versioncode="60">
+        <change>Pebble: fix Morpheuz and Misfit data being associated with the wrong device and/or user in some cases causing them to invisible in charts</change>
+        <change>Remove special handling for Conversations notfications since upstream dropped special pebble support</change>
+    </release>
     <release version="0.12.0" versioncode="59">
         <change>NB: User action needed to migrate existing data!</change>
         <change>Store activity data per device and provider to allow multiple devices of the same kind with separate data. Migration is available, except for Pebble Misfit data. Existing data from multiple devices of the same kind (eg. multiple Mi Bands) will get merged while importing</change>