diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91237f346..8a3ce44cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,14 @@
 ###Changelog
 
-####Version next
+####Version 0.17.4 (next)
 * Better integration with android music players
-* Pebble: Implement notification and incoming call privacy modes
+* Privacy options for calls (hide caller name/number)
+* Pebble: Implement notification privacy modes
 * Pebble: Support weather for Obisdian watchface
+* HPlus: Support alarms
+* HPlus: Fix time and date sync and time format (12/24)
+* HPlus: Add device specific preferences and icon
+* HPlus: Support for Makibes F68
 
 ####Version 0.17.3
 * HPlus: Improve display of new messages and phone calls
diff --git a/app/build.gradle b/app/build.gradle
index a86bb12b8..985f5ef35 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.3"
-        versionCode 84
+        versionName "0.17.4"
+        versionCode 85
     }
     buildTypes {
         release {
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index abf9e99fc..b4d46f05c 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
-    <release version="next">
+    <release version="0.17.4" versioncode="85">
         <change>Better integration with android music players</change>
-        <change>Pebble: Implement notification and incoming call privacy modes</change>
+        <change>Privacy options for calls (hide caller name/number)</change>
+        <change>Pebble: Implement notification privacy modes</change>
         <change>Pebble: Support weather for Obisdian watchface</change>
+        <change>HPlus: Support alarms</change>
+        <change>HPlus: Fix time and date sync and time format (12/24)</change>
+        <change>HPlus: Add device specific preferences and icon</change>
+        <change>HPlus: Support for Makibes F68</change>
     </release>
     <release version="0.17.3" versioncode="84">
         <change>HPlus: Improve display of new messages and phone calls</change>