diff --git a/CHANGELOG.md b/CHANGELOG.md
index c69264c8f..5abc7e0ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,8 @@
 ###Changelog
 
-####Version next
+####Version 0.17.2
 * Pebble: Fix temperature unit in Timestyle Pebble watchface
+* Add optional Cyrillic transliteration (for devices lacking the font)
 
 ####Version 0.17.1
 * Pebble: Fix installation of some watchapps
diff --git a/app/build.gradle b/app/build.gradle
index 23646f821..17ca06fd4 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.17.1"
-        versionCode 82
+        versionName "0.17.2"
+        versionCode 83
     }
     buildTypes {
         release {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
index da4fa9a06..b2d9be35f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
@@ -178,6 +178,7 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
             String action = intent.getAction();
             if (action.equals(GBDevice.ACTION_DEVICE_CHANGED)) {
                 GBDevice device = intent.getParcelableExtra(GBDevice.EXTRA_DEVICE);
+                // FIXME: mGBDevice was null here once
                 if (mGBDevice.equals(device)) {
                     mGBDevice = device;
                     boolean enableReceivers = mDeviceSupport != null && (mDeviceSupport.useAutoConnect() || mGBDevice.isInitialized());
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e219e6106..2af54dfc4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -82,7 +82,7 @@
     <string name="pref_title_notification_filter">Do Not Disturb</string>
     <string name="pref_summary_notification_filter">Stop unwanted Notifications from being sent based on the Do Not Disturb mode.</string>
     <string name="pref_title_transliteration">Transliteration</string>
-    <string name="pref_summary_transliteration">Use, if the device can not work with your language</string>
+    <string name="pref_summary_transliteration">Use, if you device has no support for your language's font (Currently Cyrillic only)</string>
 
     <string name="always">always</string>
     <string name="when_screen_off">when screen is off</string>
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 99edf2ac1..1c84aab98 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
-    <release version="next">
+    <release version="0.17.2" versioncode="83">
         <change>Pebble: Fix temperature unit in Timestyle Pebble watchface</change>
+        <change>Add optional Cyrillic transliteration (for devices lacking the font)</change>
     </release>
     <release version="0.17.1" versioncode="82">
         <change>Pebble: Fix installation of some watchapps</change>
@@ -11,10 +12,7 @@
     <release version="0.17.0" versioncode="81">
         <change>Add weather support through "Weather Notification" app</change>
         <change>Various fixes for K9 mail when using the generic notification receiver</change>
-        <change>Added transliteration support for Russian characters into English</change>
-        <change>Added transliteration option in the settings screen</change>
         <change>Add a preference to hide the notification icon of Gadgetbridge</change>
-
         <change>Pebble: Support for build-in weather system app (FW 4.x)</change>
         <change>Pebble: Add weather support for various watchfaces</change>
         <change>Pebble: Add option to automatically delete notifications that got dismissed on the phone</change>