diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index 5d79f97156b007ee63d030333e71446ad721bcc9..167062e58975acf2524b2017ba91c419a96b72d3 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -134,8 +134,6 @@ check_defines
 
 if [ "x${host_arch}" != "xarmv7l" ] ; then
 	sudo cp $(which qemu-arm-static) ${tempdir}/usr/bin/
-	warn_qemu_will_fail=1
-	echo "warn_qemu_will_fail=1" >> ${DIR}/.project
 fi
 
 echo "Log: Running: debootstrap second-stage in [${tempdir}]"
@@ -306,8 +304,15 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
 		echo "Log: (chroot) package [\${pkg}] was not installed... (add to base_pkg_list if functionality is really needed)"
 	}
 
+	is_this_qemu () {
+		unset warn_qemu_will_fail
+		if [ -f /usr/bin/qemu-arm-static ] ; then
+			warn_qemu_will_fail=1
+		fi
+	}
+
 	qemu_warning () {
-		if [ "${warn_qemu_will_fail}" ] ; then
+		if [ "\${warn_qemu_will_fail}" ] ; then
 			echo "Log: (chroot) Warning, qemu can fail here... (run on real armv7l hardware for production images)"
 			echo "Log: (chroot): [\${qemu_command}]"
 		fi
@@ -584,6 +589,7 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
 	}
 
 	#cat /chroot_script.sh
+	is_this_qemu
 	stop_init
 
 	install_pkg_updates
diff --git a/target/chroot/beagleboard.org.sh b/target/chroot/beagleboard.org.sh
index 060c9511ffe9d5c6672a13837fe1a09056331bee..a78be913fe3d089c320c34db584809eb67f50b9c 100755
--- a/target/chroot/beagleboard.org.sh
+++ b/target/chroot/beagleboard.org.sh
@@ -14,6 +14,13 @@ user_name="debian"
 
 . /.project
 
+is_this_qemu () {
+	unset warn_qemu_will_fail
+	if [ -f /usr/bin/qemu-arm-static ] ; then
+		warn_qemu_will_fail=1
+	fi
+}
+
 qemu_warning () {
 	if [ "${warn_qemu_will_fail}" ] ; then
 		echo "Log: (chroot) Warning, qemu can fail here... (run on real armv7l hardware for production images)"
@@ -208,6 +215,7 @@ unsecure_root () {
 	sed -i -e 's:UsePAM yes:UsePAM no:g' /etc/ssh/sshd_config
 }
 
+is_this_qemu
 system_patches
 setup_xorg
 setup_autologin