diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87320c837..949564e43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ###Changelog
 
+####Version 0.16.0
+* New device: ZeBand
+* ZeBand: Initial experimental support
+* Pebble 2: Fix Pebble Classic FW 3.x app variant being priorized over native Pebble 2 app variant
+
 ####Version 0.15.2
 * Mi Band: Fix crash with unknown notification sources
 
diff --git a/app/build.gradle b/app/build.gradle
index a4caf211b..e985816d1 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.15.2"
-        versionCode 79
+        versionName "0.16.0"
+        versionCode 80
     }
     buildTypes {
         release {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWReader.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWReader.java
index 3e3b4710a..53be8a972 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWReader.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pebble/PBWReader.java
@@ -124,10 +124,12 @@ public class PBWReader {
 
                 ZipInputStream zis = new ZipInputStream(afin);
                 ZipEntry ze;
+                boolean found = false;
                 try {
                     while ((ze = zis.getNextEntry()) != null) {
                         if (ze.getName().startsWith(dir)) {
                             platformDir = dir;
+                            found = true;
                             break;
                         }
                     }
@@ -135,6 +137,9 @@ public class PBWReader {
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
+                if (found) {
+                    break;
+                }
             }
 
             if (platform.equals("chalk") && platformDir.equals("")) {
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index b3a558fa0..7b1b8cb0a 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.16.0" versioncode="80">
+        <change>New device: ZeBand</change>
+        <change>ZeBand: Initial experimental support</change>
+        <change>Pebble 2: Fix Pebble Classic FW 3.x app variant being priorized over native Pebble 2 app variant</change>
+    </release>
     <release version="0.15.2" versioncode="79">
         <change>Mi Band: Fix crash with unknown notification sources</change>
     </release>