diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index e2a5d849c9..afc4aa608d 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -104,6 +104,7 @@ SYSTEM_ADD_ONS_ACCELERANTS = [ FFilterByBuildFeatures
 		#via.accelerant vmware.accelerant
 	}@ # x86
 ] ;
+SYSTEM_ADD_ONS_ACCELERANTS += [ FFilterByBuildFeatures vesa.accelerant@x86_64 ] ;
 SYSTEM_ADD_ONS_TRANSLATORS = BMPTranslator EXRTranslator GIFTranslator
 	HVIFTranslator ICOTranslator JPEGTranslator JPEG2000Translator
 	PCXTranslator PNGTranslator PPMTranslator
@@ -122,7 +123,7 @@ SYSTEM_ADD_ONS_MEDIA = [ FFilterByBuildFeatures
 	usb_webcam.media_addon
 	video_producer_demo.media_addon
 	video_window_demo.media_addon
-	firewire_dv.media_addon
+	firewire_dv.media_addon@x86
 	#legacy.media_addon
 	equalizer.media_addon
 	vst_host.media_addon
@@ -157,6 +158,7 @@ SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = [ FFilterByBuildFeatures
 		s3 vesa  #via vmware
 	}@ # x86
 ] ;
+SYSTEM_ADD_ONS_DRIVERS_GRAPHICS += [ FFilterByBuildFeatures vesa@x86_64 ] ;
 SYSTEM_ADD_ONS_DRIVERS_MIDI = emuxki ice1712 usb_midi ;
 SYSTEM_ADD_ONS_DRIVERS_NET = [ FFilterByBuildFeatures
 	x86 @{
@@ -180,11 +182,11 @@ 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 isa@x86
-	ide@ide scsi config_manager agp_gart usb firewire acpi@x86
+	ata@ata pci ps2@x86,x86_64 isa@x86,x86_64
+	ide@ide scsi config_manager agp_gart@x86 usb firewire@x86 acpi@x86
 ] ;
 SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs btrfs cdda exfat ext2 fat iso9660 nfs nfs4
-	attribute_overlay write_overlay ntfs reiserfs udf googlefs ;
+	attribute_overlay write_overlay ntfs reiserfs@x86 udf googlefs ;
 
 # wifi firmware
 for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) {
@@ -231,14 +233,14 @@ AddFilesToHaikuImage system add-ons kernel debugger
 AddFilesToHaikuImage system add-ons kernel file_systems
 	: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
 AddFilesToHaikuImage system add-ons kernel generic
-	: ata_adapter@ata bios@x86 dpc ide_adapter@ide
+	: ata_adapter@ata bios@x86,x86_64 dpc ide_adapter@ide
 		locked_pool mpu401 scsi_periph <module>tty ;
 AddFilesToHaikuImage system add-ons kernel partitioning_systems
 	: amiga_rdb apple efi_gpt intel session ;
 AddFilesToHaikuImage system add-ons kernel interrupt_controllers
 	: openpic@ppc ;
 
-if $(TARGET_ARCH) = x86 {
+if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
 	AddFilesToHaikuImage system add-ons kernel cpu : generic_x86 ;
 }
 
@@ -254,7 +256,7 @@ AddDriversToHaikuImage				: console dprintf null
 AddDriversToHaikuImage audio hmulti	: $(SYSTEM_ADD_ONS_DRIVERS_AUDIO) ;
 AddDriversToHaikuImage audio old	: $(SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD) ;
 AddDriversToHaikuImage midi			: $(SYSTEM_ADD_ONS_DRIVERS_MIDI) ;
-AddDriversToHaikuImage bus			: usb_raw fw_raw ;
+AddDriversToHaikuImage bus			: usb_raw fw_raw@x86 ;
 AddDriversToHaikuImage disk floppy	: pc_floppy@x86 ;
 AddDriversToHaikuImage disk usb		: usb_disk ;
 AddDriversToHaikuImage disk usb		: usb_floppy ;
@@ -301,22 +303,11 @@ if $(TARGET_ARCH) = x86 {
 	}
 }
 
-# libbe.so now includes what used to be in liblocale.so
-# TODO: Remove this once all optional packages have been rebuilt (i.e. after
-#       next release)!
-SYSTEM_LIBS_LIBBE_ALIASES = liblocale.so ;
-if $(TARGET_ARCH) = x86 {
-	local lib ;
-	for lib in $(SYSTEM_LIBS_LIBBE_ALIASES) {
-		AddSymlinkToHaikuHybridImage system lib : libbe.so : $(lib) : : true ;
-	}
-}
 
 SYSTEM_LIBS_ALIASES =
 	$(SYSTEM_LIBS_LIBNETWORK_ALIASES)
 	libnetapi.so
 	$(SYSTEM_LIBS_LIBGL_ALIASES)
-	$(SYSTEM_LIBS_LIBBE_ALIASES)
 ;
 
 OPTIONAL_LIBS_ALIASES =