diff --git a/setup_board b/setup_board
index bd008bd..d29568e 100755
--- a/setup_board
+++ b/setup_board
@@ -226,17 +226,25 @@
   sudo_multi "${cmds[@]}"
 
   EMERGE_CMD="${CHROMITE_BIN}/parallel_emerge"
-  PACKAGES="system virtual/target-sdk world"
+  TOOLCHAIN_PACKAGES=(
+    $("${CHROMITE_BIN}/cros_setup_toolchains" --show-packages host)
+  )
+  # Sanity check we got some valid results.
+  if [[ ${#TOOLCHAIN_PACKAGES[@]} -eq 0 ]]; then
+    die_notrace "cros_setup_toolchains failed"
+  fi
+  PACKAGES=( system virtual/target-sdk world )
 
   # First, rebuild all packages from scratch. This is needed to make sure
   # we rebuild all chroot packages.
-  sudo -E $EMERGE_CMD --emptytree --with-bdeps=y $PACKAGES
+  sudo -E $EMERGE_CMD --emptytree --with-bdeps=y \
+    "${TOOLCHAIN_PACKAGES[@]}" "${PACKAGES[@]}"
   sudo eclean -d packages
 
   # Next, install our rebuilt packages into our separate root.
   HOST_FLAGS="--root=$BOARD_ROOT --update --verbose --deep --root-deps"
   HOST_FLAGS+=" --with-bdeps=y --newuse --jobs=$NUM_JOBS --usepkgonly"
-  sudo -E $EMERGE_CMD $HOST_FLAGS --select=y $PACKAGES
+  sudo -E $EMERGE_CMD $HOST_FLAGS --select=y "${PACKAGES[@]}"
   sudo cp -a "${PKGDIR}" $BOARD_ROOT/packages
 
   # Copy our chroot version into the newly packaged chroot.