diff --git a/bootstrap.sh b/bootstrap.sh
index 8d7d578ca..8c3c294e9 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,4 +1,5 @@
 DOKKU_REPO=${DOKKU_REPO:-"https://github.com/progrium/dokku.git"}
+DOKKU_STACK=${DOKKU_STACK:-"http://s3.amazonaws.com/progrium-dokku/progrium_buildstep.tgz"}
 
 apt-get install -y linux-image-extra-`uname -r` software-properties-common
 add-apt-repository -y ppa:dotcloud/lxc-docker
@@ -6,7 +7,11 @@ apt-get update && apt-get install -y lxc-docker git ruby nginx make
 
 cd ~ && git clone ${DOKKU_REPO}
 cd dokku && make install
-cd buildstep && make build
+if [[ $DOKKU_STACK ]]; then
+  curl "$DOKKU_STACK" | gunzip -cd | docker import - progrium/buildstep
+else
+  cd buildstep && make build
+fi
 
 /etc/init.d/nginx start
 start nginx-reloader
diff --git a/buildstep b/buildstep
index 8d80c3b75..f61baf0c6 160000
--- a/buildstep
+++ b/buildstep
@@ -1 +1 @@
-Subproject commit 8d80c3b75f4cb8199f4ec98e2aa0fac78104f4cd
+Subproject commit f61baf0c660a1567cc6d008ab2b94b1d50c81c71