diff --git a/scripts/mk-ros.sh b/scripts/mk-ros.sh
index 59034235..70bd9731 100755
--- a/scripts/mk-ros.sh
+++ b/scripts/mk-ros.sh
@@ -13,7 +13,7 @@ strip_bin=$(which strip)
 if [ "${TOOLCHAIN}" != "" ]; then
   export CC=/usr/bin/${TOOLCHAIN}-gcc
   export CGO_ENABLED=1
-  strip_bin=/usr/${TOOLCHAIN}/bin/strip
+  strip_bin=/usr/bin/${TOOLCHAIN}-strip
 fi
 GOARCH=${ARCH} go build -tags netgo -installsuffix netgo -ldflags "-X github.com/rancher/os/config.VERSION=${VERSION} -linkmode external -extldflags -static" -o ${ros}
 ${strip_bin} --strip-all ${ros}
diff --git a/scripts/shell.sh b/scripts/shell.sh
new file mode 100755
index 00000000..a11fc635
--- /dev/null
+++ b/scripts/shell.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+set -e
+
+cd $(dirname $0)/..
+. ./scripts/dapper-common
+
+exec dapper -s