diff --git a/meta-witherspoon/README.md b/meta-witherspoon/README.md
index beb3ca9..5d2b5c7 100644
--- a/meta-witherspoon/README.md
+++ b/meta-witherspoon/README.md
@@ -6,3 +6,16 @@
 Witherspoon, or AC922, is an IBM POWER9 two-socket, 2U Accelerated Compute
 Server with up to 6 NVIDIA Tesla GPUs. More information can be found
 [here](https://www.ibm.com/us-en/marketplace/power-systems-ac922).
+
+In addition to witherspoon, this layer contains additional machine
+configurations such as swift. The default machine target is witherspoon,
+so in order to build a different configuration, or to build witherspoon
+after building a different one, set the MACHINE environment to the desired
+configuration name as follows (this is only needed once):
+
+    export MACHINE="<machine_configuration>"; \
+    export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE MACHINE"
+
+Then build:
+
+    bitbake obmc-phosphor-image
diff --git a/meta-witherspoon/conf/machine/swift.conf b/meta-witherspoon/conf/machine/swift.conf
new file mode 100644
index 0000000..6d6445f
--- /dev/null
+++ b/meta-witherspoon/conf/machine/swift.conf
@@ -0,0 +1,14 @@
+require conf/machine/witherspoon.conf
+
+# TODO Change to ${KMACHINE}-bmc-opp-swift.dtb when the device tree is available
+KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-witherspoon.dtb"
+
+# TODO Update once a Swift MRW is available
+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 = "e76c2fc5aeb512a0eb33438c239746de5b629885"
+MRW_XML = "witherspoon.xml"
+
+# 128MB flash size
+FLASH_SIZE = "131072"