diff --git a/cdist/conf/explorer/cpu_cores b/cdist/conf/explorer/cpu_cores
index 27cc6800..a52bddac 100755
--- a/cdist/conf/explorer/cpu_cores
+++ b/cdist/conf/explorer/cpu_cores
@@ -28,6 +28,10 @@ case "$os" in
         sysctl -n hw.physicalcpu
     ;;
 
+    "openbsd")
+        sysctl -n hw.ncpuonline
+    ;;
+
     *)
         if [ -r /proc/cpuinfo ]; then
             cores="$(grep "core id" /proc/cpuinfo | sort | uniq | wc -l)"
diff --git a/cdist/conf/explorer/disks b/cdist/conf/explorer/disks
index 7c60b17a..1780e6d2 100755
--- a/cdist/conf/explorer/disks
+++ b/cdist/conf/explorer/disks
@@ -1,3 +1,16 @@
-#!/bin/sh
-cd /dev || exit 0
-echo sd? hd? vd?
+#!/bin/sh -e
+
+os=$("$__explorer/os")
+case "$os" in
+    openbsd)
+        IFS=',' disks=$(sysctl -n hw.disknames)
+        for d in $disks; do
+            echo "${d%%:*}"
+        done | sed -n '/^[sw]d[0-9][0-9]*/p'
+    ;;
+
+    *)
+        cd /dev || exit 0
+        echo sd? hd? vd?
+    ;;
+esac