--- plugin/quilt.vim
+++ plugin/quilt.vim
@@ -39,11 +39,12 @@
 command! QuiltCheckRej call <SID>QuiltCheckRej()
 command! QuiltStatus call <SID>QuiltStatus()
 
-autocmd! BufNewFile,BufReadPost,FileReadPost * QuiltStatus
-autocmd! BufReadPost,FileReadPost * QuiltCheckRej
+augroup QuiltPlug
+autocmd!
 
 autocmd BufNewFile,BufReadPost * QuiltStatus
 autocmd BufReadPost * QuiltCheckRej
+augroup END
 
 command! -nargs=? -complete=custom,QuiltCompleteInPatch
        \ QuiltPatchEdit call <SID>QuiltPatchEdit( <f-args> )