diff --git a/Rakefile b/Rakefile
index de492c8..e63fe13 100644
--- a/Rakefile
+++ b/Rakefile
@@ -252,6 +252,10 @@ def install_prezto
   else
     puts "Setting zsh as your default shell"
     if File.exists?("/usr/local/bin/zsh")
+      if File.readlines("/private/etc/shells").grep("/usr/local/bin/zsh").empty?
+        puts "Adding zsh to standard shell list"
+        run %{ echo "/usr/local/bin/zsh" | sudo tee -a /private/etc/shells }
+      end
       run %{ chsh -s /usr/local/bin/zsh }
     else
       run %{ chsh -s /bin/zsh }