diff --git a/core/btdiscovery.cpp b/core/btdiscovery.cpp
index 20dda1a39..d945dcf21 100644
--- a/core/btdiscovery.cpp
+++ b/core/btdiscovery.cpp
@@ -85,6 +85,11 @@ static dc_descriptor_t *getDeviceType(QString btName)
 		product = "Pro Plus X";
 	}
 
+	if (btName.contains(QRegularExpression("^FS\\d{6}$"))) {
+		vendor = "Oceanic";
+		product = "Geo 4.0";
+	}
+
 	if (!vendor.isEmpty() && !product.isEmpty())
 		return descriptorLookup.value(vendor + product);
 
diff --git a/libdivecomputer b/libdivecomputer
index 119458559..e38406b35 160000
--- a/libdivecomputer
+++ b/libdivecomputer
@@ -1 +1 @@
-Subproject commit 1194585595f7a26f3ec7f96b5ad6e8f689a70258
+Subproject commit e38406b353bb0e6f27248c59eba7794cc5593032