diff --git a/build/jam/FloppyBootImage b/build/jam/FloppyBootImage
index 85cc847800..edd65e5eef 100644
--- a/build/jam/FloppyBootImage
+++ b/build/jam/FloppyBootImage
@@ -43,7 +43,9 @@ AddFilesToFloppyBootArchive beos system add-ons kernel bus_managers
 AddFilesToFloppyBootArchive beos system add-ons kernel busses agp_gart
 	: $(X86_ONLY)<agp_gart>intel ;
 AddFilesToFloppyBootArchive beos system add-ons kernel busses ide
-	: ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata it8211 ;
+	: generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 legacy_sata it8211 ;
+AddFilesToFloppyBootArchive beos system add-ons kernel busses scsi
+	: ahci ;
 AddFilesToFloppyBootArchive beos system add-ons kernel console : vga_text ;
 AddFilesToFloppyBootArchive beos system add-ons kernel file_systems
 	: $(BEOS_ADD_ONS_FILE_SYSTEMS) ;
@@ -61,7 +63,7 @@ if $(TARGET_ARCH) = x86 {
 }
 
 # drivers
-AddDriversToFloppyBootArchive disk scsi	: scsi_cd scsi_disk ;
+AddNewDriversToFloppyBootArchive disk scsi	: scsi_cd scsi_disk ;
 AddDriversToFloppyBootArchive disk usb	: usb_disk ;
 if $(NET_BOOT) = 1 {
 #AddDriversToFloppyBootArchive disk virtual	: nbd ;
diff --git a/build/jam/NetBootArchive b/build/jam/NetBootArchive
index d7f9f66aef..13169fb025 100644
--- a/build/jam/NetBootArchive
+++ b/build/jam/NetBootArchive
@@ -37,7 +37,9 @@ AddFilesToNetBootArchive beos system add-ons kernel bus_managers
 AddFilesToNetBootArchive beos system add-ons kernel busses agp_gart
 	: $(X86_ONLY)<agp_gart>intel ;
 AddFilesToNetBootArchive beos system add-ons kernel busses ide
-	: ahci generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 ;
+	: generic_ide_pci $(X86_ONLY)ide_isa silicon_image_3112 ;
+AddFilesToNetBootArchive beos system add-ons kernel busses scsi
+	: ahci ;
 AddFilesToNetBootArchive beos system add-ons kernel console : vga_text ;
 AddFilesToNetBootArchive beos system add-ons kernel file_systems
 	: $(BEOS_ADD_ONS_FILE_SYSTEMS) ;
@@ -53,7 +55,7 @@ if $(TARGET_ARCH) = x86 {
 }
 
 # drivers
-AddDriversToNetBootArchive disk scsi	: scsi_cd scsi_disk ;
+AddNewDriversToNetBootArchive disk scsi	: scsi_cd scsi_disk ;
 #AddDriversToNetBootArchive disk virtual : nbd ;
 AddDriversToNetBootArchive disk virtual	: remote_disk ;
 AddDriversToNetBootArchive net			: $(BEOS_ADD_ONS_DRIVERS_NET) ;