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 9e613a23..d6babc62 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
@@ -112,6 +112,9 @@ public class PBWReader {
                 case "diorite":
                     platformDirs = new String[]{"diorite/", "aplite/"};
                     break;
+                case "emery":
+                    platformDirs = new String[]{"emery/", "basalt/"};
+                    break;
                 default:
                     platformDirs = new String[]{"aplite/"};
             }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java
index c57a25c8..fcaabe2f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java
@@ -252,16 +252,16 @@ public class PebbleProtocol extends GBDeviceProtocol {
     // base is -8
     private static final String[] hwRevisions = {
             // Emulator
-            "silk_bb2", "unknown", "silk_bb",
+            "silk_bb2", "robert_bb", "silk_bb",
             "spalding_bb2", "snowy_bb2", "snowy_bb",
             "bb2", "bb",
             "unknown",
-            // Pebble
+            // Pebble Classic Series
             "ev1", "ev2", "ev2_3", "ev2_4", "v1_5", "v2_0",
-            // Pebble Time
+            // Pebble Time Series
             "snowy_evt2", "snowy_dvt", "spalding_dvt", "snowy_s3", "spalding",
-            // Pebble 2
-            "silk_evt", "unknown", "silk"
+            // Pebble 2 Series
+            "silk_evt", "robert_evt", "silk"
     };
 
     private static final Random mRandom = new Random();
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/PebbleUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/PebbleUtils.java
index 8a00a816..bd18cde2 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/PebbleUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/PebbleUtils.java
@@ -9,6 +9,8 @@ public class PebbleUtils {
             platformName = "chalk";
         } else if (hwRev.startsWith("silk")) {
             platformName = "diorite";
+        } else if (hwRev.startsWith("robert")) {
+            platformName = "emery";
         } else {
             platformName = "aplite";
         }
@@ -24,6 +26,8 @@ public class PebbleUtils {
             model = "pebble_time_round_black_20mm";
         } else if (hwRev.startsWith("silk")) {
             model = "pebble2_black";
+        } else if (hwRev.startsWith("robert")) {
+            model = "pebble_time2_black";
         } else {
             model = "pebble_black";
         }