diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index 033713f722162a5bfe5d63e589321a482ba98c7a..7183268fae5820ad5acb5eb661f4162a61510826 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -232,7 +232,12 @@ trap chroot_stopped EXIT
 check_defines
 
 if [ "x${host_arch}" != "xarmv7l" ] && [ "x${host_arch}" != "xaarch64" ] ; then
-	sudo cp $(which qemu-arm-static) "${tempdir}/usr/bin/"
+	if [ "x${deb_arch}" == "xarmel" ] || [ "x${deb_arch}" == "xarmhf" ] ; then
+		sudo cp $(which qemu-arm-static) "${tempdir}/usr/bin/"
+	fi
+	if [ "x${deb_arch}" == "xarm64" ] ; then
+		sudo cp $(which qemu-aarch64-static) "${tempdir}/usr/bin/"
+	fi
 fi
 
 chroot_mount_run
@@ -496,6 +501,9 @@ cat > "${DIR}/chroot_script.sh" <<-__EOF__
 		if [ -f /usr/bin/qemu-arm-static ] ; then
 			warn_qemu_will_fail=1
 		fi
+		if [ -f /usr/bin/qemu-aarch64-static ] ; then
+			warn_qemu_will_fail=1
+		fi
 	}
 
 	qemu_warning () {
@@ -1127,6 +1135,10 @@ if [ -f "${tempdir}/usr/bin/qemu-arm-static" ] ; then
 	sudo rm -f "${tempdir}/usr/bin/qemu-arm-static" || true
 fi
 
+if [ -f "${tempdir}/usr/bin/qemu-aarch64-static" ] ; then
+	sudo rm -f "${tempdir}/usr/bin/qemu-aarch64-static" || true
+fi
+
 echo "${rfs_username}:${rfs_password}" > /tmp/user_password.list
 sudo mv /tmp/user_password.list "${DIR}/deploy/${export_filename}/user_password.list"