diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c
index bf9aa6dc7763..146be35df640 100644
--- a/sys/dev/firewire/sbp.c
+++ b/sys/dev/firewire/sbp.c
@@ -641,6 +641,10 @@ sbp_probe_lun(struct sbp_dev *sdev)
 	crom_search_key(cc, CSRKEY_VENDOR);
 	crom_next(cc);
 	crom_parse_text(cc, sdev->vendor, sizeof(sdev->vendor));
+	/* skip to the unit directory for SBP-2 */
+	while ((reg = crom_search_key(cc, CSRKEY_VER)) != NULL)
+		if (reg->val == CSRVAL_T10SBP2)
+			break;
 	/* get firmware revision */
 	reg = crom_search_key(cc, CSRKEY_FIRM_VER);
 	if (reg != NULL)