diff --git a/meta-ibm/conf/machine/p10bmc.conf b/meta-ibm/conf/machine/p10bmc.conf
new file mode 100644
index 0000000..22b59b4
--- /dev/null
+++ b/meta-ibm/conf/machine/p10bmc.conf
@@ -0,0 +1,35 @@
+KERNEL_DEVICETREE = "aspeed-bmc-ibm-rainier.dtb aspeed-bmc-ibm-rainier-4u.dtb aspeed-bmc-ibm-everest.dtb"
+UBOOT_MACHINE = "ast2600_openbmc_spl_emmc_defconfig"
+UBOOT_DEVICETREE = "ast2600-rainier"
+SPL_BINARY = "spl/u-boot-spl.bin"
+
+OBMC_POWER_SUPPLY_INSTANCES = "0 1 2 3"
+
+# TODO remove the MACHINEOVERRIDES when the rainier.conf file is removed.
+MACHINEOVERRIDES =. "p10bmc:"
+require conf/machine/include/ast2600.inc
+require conf/machine/include/obmc-bsp-common.inc
+require conf/machine/include/openpower.inc
+include conf/machine/include/ibm-power10-cpu.inc
+require conf/distro/include/openpower-virtual-pnor.inc
+require conf/distro/include/phosphor-mmc.inc
+require conf/distro/include/ibm-mpreboot.inc
+
+SERIAL_CONSOLES = "115200;ttyS4"
+
+MRW_XML = "witherspoon.xml"
+PHOSPHOR_MRW_LICENSE = "Apache-2.0"
+PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
+PHOSPHOR_MRW_URI = "git://github.com/open-power/witherspoon-xml"
+PHOSPHOR_MRW_REV = "c622cb5a5dd3ebc2a4eef558d1b70740f914e6f7"
+
+VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = ""
+
+PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \
+    "phosphor-fan-control-fan-config"
+PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \
+    "phosphor-fan-presence-config"
+
+SKIP_BROKEN_MRW = "1"
+
+IMAGE_FEATURES_remove = "obmc-ikvm"