diff --git a/scripts/bootstrap-to-docker.sh b/scripts/bootstrap-to-docker.sh
index 2f29fb9..a5e8ab0 100755
--- a/scripts/bootstrap-to-docker.sh
+++ b/scripts/bootstrap-to-docker.sh
@@ -14,13 +14,17 @@ fi
 
 tmpdir=${tmpdir:-"/var/tmp"}
 docker_user=${docker_user:-${USER}}
-archs=${archs:-"i386 amd64"}
-
-ubuntu_qt5="xenial wily vivid trusty"
+if test -z "$archs"; then
+    case $(dpkg --print-architecture); in
+        (amd64) archs="i386 amd64";;
+        (*) archs=$(dpkg --print-architecture)
+    esac
+fi
+ubuntu_qt5="yakkety xenial wily vivid trusty"
 ubuntu_qt4="precise"
-debian_qt5="jessie sid"
+debian_qt5="stretch jessie sid"
 debian_qt4="wheezy"
-debian_unsupported="buster stretch" # not in /usr/share/debootstrap/scripts
+debian_unsupported="buster" # not in /usr/share/debootstrap/scripts
 
 ubuntu=("${ubuntu_qt5}" "${ubuntu_qt4}")
 debian=("${debian_qt5}" "${debian_qt4}")