diff --git a/newbox b/newbox
index 43e5e0b..f9821c1 100755
--- a/newbox
+++ b/newbox
@@ -5,6 +5,19 @@ fail() {
     exit 1
 }
 
+if ! which zsh >/dev/null 2>&1; then
+    if which aptitude >/dev/null 2>&1; then
+        sudo aptitude install -y zsh
+    elif which brew >/dev/null 2>&1; then
+        brew install zsh
+    else
+        echo "Don't know how to install zsh on this box. Install zsh and run this again."
+        exit 1
+    fi
+fi
+zsh
+chsh -s `which zsh`
+
 if ! which git >/dev/null 2>&1; then
     if which aptitude >/dev/null 2>&1; then
         sudo aptitude install -y git-core