1diff --git a/lib/correction.zsh b/lib/correction.zsh
2index 176ec16d510ebe7da2fa077f144b434e3a42e2cf..07fbcfd364cd32020a5fb60260b66079c2c398f9 100644
3--- a/lib/correction.zsh
4+++ b/lib/correction.zsh
5@@ -1,2 +1,14 @@
6-# correct commands, but not any arguments (correct_all would do that)
7-setopt correct
8+if [[ "$DISABLE_CORRECTION" == "true" ]]; then
9+ return
10+else
11+ setopt correct_all
12+
13+ alias man='nocorrect man'
14+ alias mv='nocorrect mv'
15+ alias mysql='nocorrect mysql'
16+ alias mkdir='nocorrect mkdir'
17+ alias gist='nocorrect gist'
18+ alias heroku='nocorrect heroku'
19+ alias ebuild='nocorrect ebuild'
20+ alias hpodder='nocorrect hpodder'
21+fi
22diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
23index 55980fb08998e6bb269a0ab858fb6c86bf37742d..d4dded73a199689faae3d064ffc7f96c237975e3 100644
24--- a/templates/zshrc.zsh-template
25+++ b/templates/zshrc.zsh-template
26@@ -26,6 +26,9 @@ ZSH_THEME="robbyrussell"
27 # Uncomment following line if you want to disable autosetting terminal title.
28 # DISABLE_AUTO_TITLE="true"
2930+# Uncomment following line if you want to disable command autocorrection
31+# DISABLE_CORRECTION="true"
32+
33 # Uncomment following line if you want red dots to be displayed while waiting for completion
34 # COMPLETION_WAITING_DOTS="true"
35