diff --git a/build/jam/images/HaikuImage b/build/jam/images/HaikuImage
index a65022bc9c..fc8429aa74 100644
--- a/build/jam/images/HaikuImage
+++ b/build/jam/images/HaikuImage
@@ -115,12 +115,12 @@ SYSTEM_NETWORK_PROTOCOLS = ipv4 tcp udp icmp unix icmp6 ipv6 ;
 
 SYSTEM_ADD_ONS_ACCELERANTS = [ FFilterByBuildFeatures
 	x86,x86_64 @{
-		vesa.accelerant
+		vesa.accelerant intel_extreme.accelerant
 	}@ # x86,x86_64
 	x86 @{
 		3dfx.accelerant ati.accelerant matrox.accelerant neomagic.accelerant
-		nvidia.accelerant intel_810.accelerant intel_extreme.accelerant
-		radeon.accelerant radeon_hd.accelerant s3.accelerant 
+		nvidia.accelerant intel_810.accelerant
+		radeon.accelerant radeon_hd.accelerant s3.accelerant
 		#via.accelerant vmware.accelerant
 	}@ # x86
 ] ;
@@ -173,10 +173,10 @@ SYSTEM_ADD_ONS_DRIVERS_AUDIO = auich auvia echo3g emuxki hda ice1712 sis7018 ;
 SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD = ; #cmedia usb_audio ;
 SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = [ FFilterByBuildFeatures
 	x86,x86_64 @{
-		vesa
+		vesa intel_extreme
 	}@ # x86,x86_64
 	x86 @{
-		ati 3dfx intel_810 intel_extreme matrox neomagic nvidia radeon radeon_hd
+		ati 3dfx intel_810 matrox neomagic nvidia radeon radeon_hd
 		s3 #via vmware
 	}@ # x86
 ] ;
@@ -204,7 +204,7 @@ SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures
 SYSTEM_ADD_ONS_DRIVERS_POWER = [ FFilterByBuildFeatures acpi_button@x86 ] ;
 SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures
 	ata@ata pci ps2@x86,x86_64 isa@x86,x86_64
-	ide@ide scsi config_manager agp_gart@x86 usb firewire@x86 acpi@x86
+	ide@ide scsi config_manager agp_gart@x86,x86_64 usb firewire@x86 acpi@x86
 	virtio random
 ] ;
 SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs bindfs btrfs cdda exfat ext2 fat iso9660 nfs