diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh
old mode 100644
new mode 100755
index 732a403b7..b1bf3f94c
--- a/oh-my-zsh.sh
+++ b/oh-my-zsh.sh
@@ -1,7 +1,7 @@
 # Check for updates on initial load...
 if [ "$DISABLE_AUTO_UPDATE" != "true" ]
 then
-  /usr/bin/env ZSH=$ZSH zsh $ZSH/tools/check_for_upgrade.sh
+  /usr/bin/env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh $ZSH/tools/check_for_upgrade.sh
 fi
 
 # Initializes Oh My Zsh
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index e52553241..0fba09fd1 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -17,6 +17,9 @@ ZSH_THEME="robbyrussell"
 # Comment this out to disable weekly auto-update checks
 # DISABLE_AUTO_UPDATE="true"
 
+# Comment this out to automatically approve of updates without prompt
+# DISABLE_UPDATE_PROMPT="true"
+
 # Uncomment following line if you want to disable colors in ls
 # DISABLE_LS_COLORS="true"
 
diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh
old mode 100644
new mode 100755
diff --git a/tools/uninstall.sh b/tools/uninstall.sh
old mode 100644
new mode 100755
diff --git a/tools/upgrade.sh b/tools/upgrade.sh
old mode 100644
new mode 100755