diff --git a/build/jam/images/definitions/minimum b/build/jam/images/definitions/minimum
index fbf9cb9206..9fcfd12aac 100644
--- a/build/jam/images/definitions/minimum
+++ b/build/jam/images/definitions/minimum
@@ -211,11 +211,12 @@ SYSTEM_ADD_ONS_DRIVERS_SENSOR = [ FFilterByBuildFeatures
 
 
 SYSTEM_ADD_ONS_BUS_MANAGERS = [ FFilterByBuildFeatures
-	acpi@x86,x86_64	agp_gart@x86,x86_64 ata
+	acpi@x86,x86_64 agp_gart@x86,x86_64 ata
 	config_manager
 	firewire@x86
-	i2c@x86,x86_64
-	scsi isa@x86,x86_64
+	i2c@x86,x86_64 isa@x86,x86_64
+	mmc
+	scsi
 	pci ps2@x86,x86_64
 	random
 	usb
diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku
index de4c2d4120..d8e5b7352d 100644
--- a/build/jam/packages/Haiku
+++ b/build/jam/packages/Haiku
@@ -34,6 +34,7 @@ AddFilesToPackage add-ons kernel busses ata
 	: generic_ide_pci it8211 legacy_sata silicon_image_3112 highpoint_ide_pci ide_isa@x86 ;
 
 AddFilesToPackage add-ons kernel busses i2c : pch_i2c@x86,x86_64 ;
+AddFilesToPackage add-ons kernel busses mmc : sdhci_pci ;
 AddFilesToPackage add-ons kernel busses random : virtio_rng ;
 AddFilesToPackage add-ons kernel busses scsi : ahci virtio_scsi ;
 AddFilesToPackage add-ons kernel busses usb : <usb>uhci <usb>ohci <usb>ehci
@@ -61,6 +62,7 @@ if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
 # drivers
 AddNewDriversToPackage 				: wmi@x86,x86_64 ;
 AddNewDriversToPackage disk			: nvme_disk@x86,x86_64 ;
+AddNewDriversToPackage disk mmc		: mmc_disk ;
 AddNewDriversToPackage disk scsi	: scsi_cd scsi_disk ;
 AddNewDriversToPackage disk virtual : virtio_block ram_disk ;
 AddNewDriversToPackage power		: $(SYSTEM_ADD_ONS_DRIVERS_POWER) ;
@@ -194,10 +196,12 @@ AddBootModuleSymlinksToPackage
 	generic_ide_pci
 	ide_isa@x86 isa@x86,x86_64 intel it8211
 	legacy_sata locked_pool
+	mmc mmc_disk
 	nvme_disk@x86,x86_64
 	openpic@ppc
 	packagefs pci
 	scsi scsi_cd scsi_disk scsi_periph silicon_image_3112 highpoint_ide_pci
+	sdhci_pci
 	usb usb_disk <usb>ehci <usb>ohci <usb>uhci <usb>xhci
 	virtio virtio_block virtio_pci virtio_scsi
 ;
diff --git a/headers/private/drivers/mmc.h b/headers/private/drivers/mmc.h
index 43f3910486..aa34a01f4d 100644
--- a/headers/private/drivers/mmc.h
+++ b/headers/private/drivers/mmc.h
@@ -12,7 +12,7 @@
 #include <device_manager.h>
 
 
-#define MMC_BUS_MODULE_NAME "bus_managers/mmc_bus/driver_v1"
+#define MMC_BUS_MODULE_NAME "bus_managers/mmc/driver_v1"
 
 
 enum {
diff --git a/src/add-ons/kernel/bus_managers/mmc/Jamfile b/src/add-ons/kernel/bus_managers/mmc/Jamfile
index 59b8cc1b3e..d7095e1f2d 100644
--- a/src/add-ons/kernel/bus_managers/mmc/Jamfile
+++ b/src/add-ons/kernel/bus_managers/mmc/Jamfile
@@ -3,7 +3,7 @@ SubDir HAIKU_TOP src add-ons kernel bus_managers mmc ;
 UsePrivateKernelHeaders ;
 UsePrivateHeaders drivers ;
 
-KernelAddon mmc_bus :
+KernelAddon mmc :
 	mmc_module.cpp
 	mmc_bus.cpp
 	;