diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35f3d512..86b321c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ###Changelog
 
+####Version 0.17.1
+* Pebble: Fix installation of some watchapps
+* Pebble: Try to improve PebbleKit compatibility
+* HPlus: Fix bug setting current date
+
 ####Version 0.17.0
 * Add weather support through "Weather Notification" app
 * Various fixes for K9 mail when using the generic notification receiver
diff --git a/app/build.gradle b/app/build.gradle
index b6b68af6..23646f82 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.0"
-        versionCode 81
+        versionName "0.17.1"
+        versionCode 82
     }
     buildTypes {
         release {
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index d5f774bd..1d0c0a2b 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.17.1" versioncode="82">
+        <change>Pebble: Fix installation of some watchapps</change>
+        <change>Pebble: Try to improve PebbleKit compatibility</change>
+        <change>HPlus: Fix bug setting current date</change>
+    </release>
     <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>