diff --git a/vimfiles.stefan/vimrc b/vimfiles.stefan/vimrc
index 0908085..d4c0199 100644
--- a/vimfiles.stefan/vimrc
+++ b/vimfiles.stefan/vimrc
@@ -172,6 +172,9 @@ if &diff
     setlocal nospell
 endif
 
+" Switch spell off in diff mode
+autocmd OptionSet diff setlocal nospell
+
 " horizontal scrollbar in diff-mode
 set diffopt=filler,vertical
 " don't switch on DiffChar by default