diff --git a/build-setup.sh b/build-setup.sh
index 1a2ee1c..632d71e 100755
--- a/build-setup.sh
+++ b/build-setup.sh
@@ -35,6 +35,7 @@
 #  target             The target we aim to build:
 #                     evb-ast2500|palmetto|qemu|qemux86-64
 #                     romulus|s2600wf|witherspoon|zaius|tiogapass|gsj|mihawk
+#                     witherspoon-tacoma|
 #                     Default: "qemu"
 #  no_tar             Set to true if you do not want the debug tar built
 #                     Default: "false"
@@ -89,6 +90,7 @@
 xtrct_path="${obmc_dir}/build/tmp"
 xtrct_copy_timeout="300"
 
+bitbake_target="obmc-phosphor-image"
 PROXY=""
 
 # Determine the architecture
@@ -150,6 +152,12 @@
     MACHINE="witherspoon-128"
     DISTRO="openbmc-witherspoon"
     ;;
+  witherspoon-tacoma)
+    LAYER_DIR="meta-ibm/meta-witherspoon"
+    MACHINE="witherspoon-tacoma"
+    DISTRO="openbmc-openpower"
+    bitbake_target="aspeed-image-norootfs"
+    ;;
   evb-ast2500)
     LAYER_DIR="meta-evb/meta-evb-aspeed/meta-evb-ast2500"
     MACHINE="evb-ast2500"
@@ -296,9 +304,8 @@
 mkdir -p ${WORKSPACE}
 
 # Determine command for bitbake image build
-bitbake_image="obmc-phosphor-image"
 if [ $no_tar = "false" ]; then
-    bitbake_image="${bitbake_image} obmc-phosphor-debug-tarball"
+    bitbake_target="${bitbake_target} obmc-phosphor-debug-tarball"
 fi
 
 cat > "${WORKSPACE}"/build.sh << EOF_SCRIPT
@@ -366,9 +373,9 @@
 
 # Kick off a build
 if [[ -n "${nice_priority}" ]]; then
-    nice -${nice_priority} bitbake ${BITBAKE_OPTS} ${bitbake_image}
+    nice -${nice_priority} bitbake ${BITBAKE_OPTS} ${bitbake_target}
 else
-    bitbake ${BITBAKE_OPTS} ${bitbake_image}
+    bitbake ${BITBAKE_OPTS} ${bitbake_target}
 fi
 
 # Copy internal build directory into xtrct_path directory