diff --git a/meta-witherspoon/conf/local.conf.sample b/meta-witherspoon/conf/local.conf.sample
index 9dec774..d3a2303 100644
--- a/meta-witherspoon/conf/local.conf.sample
+++ b/meta-witherspoon/conf/local.conf.sample
@@ -1,3 +1,4 @@
+#MACHINE ?= "mihawk"
 #MACHINE ?= "swift"
 #MACHINE ?= "witherspoon-128"
 MACHINE ??= "witherspoon"
diff --git a/meta-witherspoon/conf/machine/mihawk.conf b/meta-witherspoon/conf/machine/mihawk.conf
new file mode 100644
index 0000000..08d9ab7
--- /dev/null
+++ b/meta-witherspoon/conf/machine/mihawk.conf
@@ -0,0 +1,38 @@
+KMACHINE = "aspeed"
+KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb"
+KERNEL_FEATURES_append = " phosphor-wdt-on-panic"
+
+UBOOT_MACHINE = "ast_g5_ncsi_config"
+
+OBMC_POWER_SUPPLY_INSTANCES = "0 1"
+
+PREFERRED_PROVIDER_virtual/p9-vcs-workaround = ''
+
+require conf/machine/include/ast2500.inc
+require conf/machine/include/obmc-bsp-common.inc
+require conf/machine/include/openpower.inc
+require conf/machine/include/p9.inc
+
+PHOSPHOR_MRW_LICENSE = "Apache-2.0"
+PHOSPHOR_MRW_LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
+PHOSPHOR_MRW_URI = "git://github.com/open-power/mihawk-xml"
+PHOSPHOR_MRW_REV = "b9929ba9fd96d78da01bce8a2a157851dce9e5cb"
+
+
+
+# Inhibit phosphor-hwmon-config-mrw
+VIRTUAL-RUNTIME_phosphor-hwmon-config_df-mrw = ""
+
+# Inhibit phosphor-fan-presence-mrw-native
+PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \
+    "phosphor-fan-presence-config"
+
+# Inhibit phosphor-fan-control-fan-config-mrw-native
+PREFERRED_PROVIDER_virtual/phosphor-fan-control-fan-config_df-mrw = \
+    "phosphor-fan-control-fan-config"
+
+# Inhibit mihawk-led-manager-config-native
+PREFERRED_PROVIDER_virtual/phosphor-led-manager-config-native_df-mrw = \
+    "mihawk-led-manager-config-native"
+
+PREFERRED_PROVIDER_virtual/phosphor-logging-callouts_df-mrw = "mihawk-phosphor-logging-callouts-native"
\ No newline at end of file