diff --git a/meta-ibm/conf/machine/huygens.conf b/meta-ibm/conf/machine/huygens.conf
new file mode 100644
index 0000000..a5f6cd0
--- /dev/null
+++ b/meta-ibm/conf/machine/huygens.conf
@@ -0,0 +1,25 @@
+MACHINEOVERRIDES =. "pstbmc:"
+require conf/machine/pstbmc.conf
+
+# Focus Huygens initially on a multi-BMC setup for integrating
+# BMC to BMC redundancy logic. Remove anything host or chassis
+# related that causes failures booting to BMC Ready.
+MACHINE_FEATURES:remove = " \
+    op-fsi \
+    phal \
+    "
+
+DISTRO_FEATURES:remove = " \
+    openpower-virtual-pnor \
+    openpower-hostfw-over-pldm \
+    mpreboot \
+    "
+
+IMAGE_FEATURES:remove = " \
+    obmc-leds \
+    obmc-chassis-mgmt \
+    obmc-fan-control \
+    obmc-fan-mgmt \
+    obmc-host-ctl \
+    obmc-host-ipmi \
+    "
diff --git a/meta-ibm/conf/templates/default/conf-notes.txt b/meta-ibm/conf/templates/default/conf-notes.txt
index 99d7599..8070972 100644
--- a/meta-ibm/conf/templates/default/conf-notes.txt
+++ b/meta-ibm/conf/templates/default/conf-notes.txt
@@ -2,6 +2,8 @@
 
 pstbmc:
 MACHINE=pstbmc bitbake obmc-phosphor-image
+huygens:
+MACHINE=huygens bitbake obmc-phosphor-image
 p10bmc:
 MACHINE=p10bmc bitbake obmc-phosphor-image
 witherspoon: