diff --git a/bin/teardown.sh b/bin/teardown.sh
index b400b1a..2907ab6 100755
--- a/bin/teardown.sh
+++ b/bin/teardown.sh
@@ -2,8 +2,12 @@
 
 TOP="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/.."
 
+case $* in
+    --reboot) reboot=1; shift ;;
+esac
+
 if [ $# != 1 ]; then
-    echo "usage: teardown.sh name"
+    echo "usage: teardown.sh [--reboot] name"
     exit 1
 fi
 
@@ -14,7 +18,7 @@ teardown () {
     sed -s 's/cluster.\(apiserver\|worker\)/cluster.host/' $TOP/clusters/$d/default.nix > $f
     nixops modify -d $d $f
     nixops deploy -d $d
-    nixops reboot -d $d
+    [ ! -z $reboot ] && nixops reboot -d $d
     nixops ssh-for-each -d $d "rm -rf /var/run/kubernetes /var/lib/kubernetes /var/lib/etcd /var/lib/kubelet /var/lib/cfssl"
     rm $f
 }