diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 84af617b4c..37f345950f 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -227,7 +227,7 @@ if $(HAIKU_ATA_STACK) = 1 {
 }
 
 AddFilesToHaikuImage system add-ons kernel busses scsi
-	: ahci ;
+	: ahci virtio_scsi ;
 AddFilesToHaikuImage system add-ons kernel busses usb
 	: <usb>uhci <usb>ohci <usb>ehci ;
 AddFilesToHaikuImage system add-ons kernel busses virtio
@@ -611,7 +611,7 @@ AddBootModuleSymlinksToHaikuImage
 	ide_isa@x86
 	<usb>uhci <usb>ohci <usb>ehci
 	scsi_cd scsi_disk usb_disk
-	virtio virtio_pci virtio_block	
+	virtio virtio_pci virtio_block virtio_scsi
 	efi_gpt
 	intel
 	bfs
diff --git a/src/system/kernel/device_manager/device_manager.cpp b/src/system/kernel/device_manager/device_manager.cpp
index 27e04080f1..fff96268c5 100644
--- a/src/system/kernel/device_manager/device_manager.cpp
+++ b/src/system/kernel/device_manager/device_manager.cpp
@@ -1619,6 +1619,7 @@ device_node::_GetNextDriverPath(void*& cookie, KPath& _path)
 						_AddPath(*stack, "busses");
 					}
 					_AddPath(*stack, "drivers", sGenericContextPath);
+					_AddPath(*stack, "busses/scsi");					
 				}
 				break;
 		}