diff --git a/vim.spec b/vim.spec
index c961825..d69e06f 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1223,6 +1223,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Tue Jun 03 2008 Karsten Hopp <karsten@redhat.com> 7.1.305-1
 - patchlevel 305
+- put /etc/vimrc autocmd's into fedora augroup (similar to #241308)
 
 * Thu May 15 2008 Karsten Hopp <karsten@redhat.com> 7.1.298-1
 - patchlevel 298
diff --git a/vimrc b/vimrc
index 9097e86..ddb3483 100644
--- a/vimrc
+++ b/vimrc
@@ -13,6 +13,8 @@ set ruler		" show the cursor position all the time
 
 " Only do this part when compiled with support for autocommands
 if has("autocmd")
+  augroup fedora
+  autocmd!
   " In text files, always limit the width of text to 78 characters
   autocmd BufRead *.txt set tw=78
   " When editing a file, always jump to the last cursor position
@@ -24,6 +26,7 @@ if has("autocmd")
   autocmd BufNewFile,BufReadPre /media/*,/mnt/* set directory=~/tmp,/var/tmp,/tmp
   " start with spec file template
   autocmd BufNewFile *.spec 0r /usr/share/vim/vimfiles/template.spec
+  augroup END
 endif
 
 if has("cscope") && filereadable("/usr/bin/cscope")