diff --git a/common/travis/build.sh b/common/travis/build.sh
index c388af06841..32cefdbc739 100755
--- a/common/travis/build.sh
+++ b/common/travis/build.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # build.sh
 
@@ -9,8 +9,19 @@ fi
 # Tell xbps-src what is our arch, this is done when doing
 # binary-bootstrap, but we need to do it every time since
 # our masterdir is ethereal.
-/bin/echo -e '\x1b[32mWriting bootstrap arch into .xbps_chroot_init of masterdir\x1b[0m'
-echo "$1" > /hostrepo/masterdir/.xbps_chroot_init
+# /bin/echo -e '\x1b[32mWriting bootstrap arch into .xbps_chroot_init of masterdir\x1b[0m'
+# echo "$1" > /hostrepo/masterdir/.xbps_chroot_init
+
+/bin/echo -e '\x1b[32mPreparing chroot with chroot_prepare()\x1b[0m'
+source hostrepo/common/xbps-src/shutils/chroot.sh || {
+	echo "Failed to source chroot.sh for chroot_prepare()" >&2 ;
+	exit 1
+}
+
+XBPS_SRCPKGDIR=/hostrepo/srcpkgs XBPS_MASTERDIR=/ chroot_prepare $1 || {
+	echo "Failed to prepare chroot!" >&2 ;
+	exit 1
+}
 
 PKGS=$(/hostrepo/xbps-src sort-dependencies $(cat /tmp/templates))