diff --git a/src/add-ons/kernel/drivers/disk/Jamfile b/src/add-ons/kernel/drivers/disk/Jamfile
index fa2e15412f..fc0cc7f485 100644
--- a/src/add-ons/kernel/drivers/disk/Jamfile
+++ b/src/add-ons/kernel/drivers/disk/Jamfile
@@ -1,6 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers disk ;
 
 SubInclude HAIKU_TOP src add-ons kernel drivers disk acpi_loader ;
+SubInclude HAIKU_TOP src add-ons kernel drivers disk floppy ;
 SubInclude HAIKU_TOP src add-ons kernel drivers disk scsi ;
 SubInclude HAIKU_TOP src add-ons kernel drivers disk usb ;
 SubInclude HAIKU_TOP src add-ons kernel drivers disk virtual ;
diff --git a/src/add-ons/kernel/drivers/disk/floppy/Jamfile b/src/add-ons/kernel/drivers/disk/floppy/Jamfile
new file mode 100644
index 0000000000..1f85e51261
--- /dev/null
+++ b/src/add-ons/kernel/drivers/disk/floppy/Jamfile
@@ -0,0 +1,3 @@
+SubDir HAIKU_TOP src add-ons kernel drivers disk floppy ;
+
+SubInclude HAIKU_TOP src add-ons kernel drivers disk floppy pc_floppy ;
diff --git a/src/add-ons/kernel/drivers/disk/floppy/pc_floppy/Jamfile b/src/add-ons/kernel/drivers/disk/floppy/pc_floppy/Jamfile
index fd20606c55..a83bd9d27e 100644
--- a/src/add-ons/kernel/drivers/disk/floppy/pc_floppy/Jamfile
+++ b/src/add-ons/kernel/drivers/disk/floppy/pc_floppy/Jamfile
@@ -1,10 +1,10 @@
-SubDir HAIKU_TOP src add-ons kernel drivers arch x86 floppy ;
+SubDir HAIKU_TOP src add-ons kernel drivers disk floppy pc_floppy ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
 UsePrivateHeaders drivers kernel ;
 
-KernelAddon floppy :
+KernelAddon pc_floppy :
 	floppy.c
 	floppy_ctrl.c
 	device_icons.c