diff --git a/build/jam/FloppyBootImage b/build/jam/FloppyBootImage
index 39a957be79..458aa77cb9 100644
--- a/build/jam/FloppyBootImage
+++ b/build/jam/FloppyBootImage
@@ -3,7 +3,7 @@
 
 local X86_ONLY = ;
 local PPC_ONLY = ;
-if $(TARGET_ARCH) = x86 {
+if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
 	X86_ONLY = "" ;
 } else if $(TARGET_ARCH) = ppc {
 	X86_ONLY = ;
@@ -64,6 +64,8 @@ if $(TARGET_ARCH) = x86_64 {
 	AddFilesToFloppyBootArchive system add-ons kernel partitioning_systems
 		: intel session ;
 
+	AddFilesToFloppyBootArchive system add-ons kernel cpu : generic_x86 ;
+
 	AddNewDriversToFloppyBootArchive disk scsi : scsi_cd scsi_disk ;
 } else {
 	# modules
@@ -97,7 +99,7 @@ if $(TARGET_ARCH) = x86_64 {
 			: <usb>uhci <usb>ohci <usb>ehci ;
 	}
 
-	if $(TARGET_ARCH) = x86 {
+	if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
 		AddFilesToFloppyBootArchive system add-ons kernel cpu : generic_x86 ;
 	}
 
@@ -146,7 +148,7 @@ if $(NET_BOOT) = 1 {
 if $(TARGET_ARCH) = x86_64 {
 	AddBootModuleSymlinksToFloppyBootArchive
 		ata dpc config_manager pci scsi ata_adapter locked_pool scsi_periph
-		generic_ide_pci scsi_cd scsi_disk intel session iso9660
+		generic_x86 generic_ide_pci scsi_cd scsi_disk intel session iso9660
 		attribute_overlay write_overlay
 	;
 } else {
diff --git a/src/add-ons/kernel/cpu/Jamfile b/src/add-ons/kernel/cpu/Jamfile
index 8c8a5616e9..89decfdb70 100644
--- a/src/add-ons/kernel/cpu/Jamfile
+++ b/src/add-ons/kernel/cpu/Jamfile
@@ -1,3 +1,3 @@
 SubDir HAIKU_TOP src add-ons kernel cpu ;
 
-SubInclude HAIKU_TOP src add-ons kernel cpu $(TARGET_ARCH) ;
+SubInclude HAIKU_TOP src add-ons kernel cpu $(TARGET_KERNEL_ARCH) ;