diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc930e462..1c2910f86 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1062,7 +1062,7 @@ elseif(SunOS)
         src/detection/bluetoothradio/bluetoothradio_nosupport.c
         src/detection/disk/disk_sunos.c
         src/detection/dns/dns_linux.c
-        src/detection/physicaldisk/physicaldisk_nosupport.c
+        src/detection/physicaldisk/physicaldisk_sunos.c
         src/detection/physicalmemory/physicalmemory_linux.c
         src/detection/diskio/diskio_sunos.c
         src/detection/displayserver/linux/displayserver_linux.c
diff --git a/src/detection/physicaldisk/physicaldisk_sunos.c b/src/detection/physicaldisk/physicaldisk_sunos.c
new file mode 100644
index 000000000..c510d43e6
--- /dev/null
+++ b/src/detection/physicaldisk/physicaldisk_sunos.c
@@ -0,0 +1,71 @@
+#include "physicaldisk.h"
+#include "util/stringUtils.h"
+#include "sys/scsi/generic/inquiry.h"
+
+#include <libdevinfo.h>
+
+struct FFWalkTreeBundle
+{
+    FFPhysicalDiskOptions* options;
+    FFlist* disks;
+};
+
+static int walkDevTree(di_node_t node, struct FFWalkTreeBundle* bundle)
+{
+    if (ffStrEquals(di_node_name(node), "sd"))
+    {
+        char* productId;
+        char* vendorId;
+        if (di_prop_lookup_strings(DDI_DEV_T_ANY, node, "inquiry-product-id", &productId) > 0
+            && di_prop_lookup_strings(DDI_DEV_T_ANY, node, "inquiry-vendor-id", &vendorId) > 0)
+        {
+            FF_STRBUF_AUTO_DESTROY name = ffStrbufCreateF("%s %s", vendorId, productId);
+            if (bundle->options->namePrefix.length && !ffStrbufStartsWithIgnCase(&name, &bundle->options->namePrefix))
+                return DI_WALK_CONTINUE;
+
+            FFPhysicalDiskResult* device = (FFPhysicalDiskResult*) ffListAdd(bundle->disks);
+            ffStrbufInitMove(&device->name, &name);
+            ffStrbufInit(&device->devPath);
+            ffStrbufInit(&device->serial);
+            ffStrbufInit(&device->revision);
+            ffStrbufInit(&device->interconnect);
+            device->temperature = FF_PHYSICALDISK_TEMP_UNSET;
+            device->type = FF_PHYSICALDISK_TYPE_NONE;
+            device->size = 0;
+
+            char* buf;
+            if (di_prop_lookup_strings(DDI_DEV_T_ANY, node, "inquiry-serial-no", &buf) > 0)
+                ffStrbufSetS(&device->serial, buf);
+            if (di_prop_lookup_strings(DDI_DEV_T_ANY, node, "inquiry-revision-id", &buf) > 0)
+                ffStrbufSetS(&device->revision, buf);
+            if (di_prop_lookup_strings(DDI_DEV_T_ANY, node, "class", &buf) > 0)
+                ffStrbufSetS(&device->interconnect, buf);
+
+            device->type |= di_prop_find(DDI_DEV_T_ANY, node, "removable-media") ? FF_PHYSICALDISK_TYPE_REMOVABLE : FF_PHYSICALDISK_TYPE_FIXED;
+
+            int* value;
+            if (di_prop_lookup_ints(DDI_DEV_T_ANY, node, "device-solid-state", &value) > 0)
+                device->type |= *value ? FF_PHYSICALDISK_TYPE_SSD : FF_PHYSICALDISK_TYPE_HDD;
+            if (di_prop_lookup_ints(DDI_DEV_T_ANY, node, "inquiry-device-type", &value) > 0)
+                device->type |= *value == DTYPE_DIRECT ? FF_PHYSICALDISK_TYPE_READWRITE : *value == DTYPE_RODIRECT ? FF_PHYSICALDISK_TYPE_READONLY : 0;
+
+            int64_t* nblocks;
+            if (di_prop_lookup_int64(DDI_DEV_T_ANY, node, "device-nblocks", &nblocks) > 0
+                && di_prop_lookup_ints(DDI_DEV_T_ANY, node, "device-blksize", &value) > 0)
+                device->size = (uint64_t) ((uint64_t) *nblocks * (uint64_t) *value);
+        }
+    }
+
+    return DI_WALK_CONTINUE;
+}
+
+const char* ffDetectPhysicalDisk(FFlist* result, FFPhysicalDiskOptions* options)
+{
+    di_node_t rootNode = di_init("/", DINFOCPYALL);
+    if (rootNode == DI_NODE_NIL)
+        return "di_init() failed";
+    di_walk_node(rootNode, DI_WALK_CLDFIRST, &(struct FFWalkTreeBundle) { options, result }, (void*) walkDevTree);
+    di_fini(rootNode);
+
+    return NULL;
+}