diff --git a/vim-6.4-cvim.patch b/vim-6.4-cvim.patch
index 463506d..046891e 100644
--- a/vim-6.4-cvim.patch
+++ b/vim-6.4-cvim.patch
@@ -1,27 +1,6 @@
---- vim63/cvim/plugin/c.vim.rhdefaults	2005-09-08 09:37:42.000000000 +0000
-+++ vim63/cvim/plugin/c.vim	2005-09-08 09:39:24.000000000 +0000
-@@ -48,7 +48,8 @@
- 	"
- else
- 	"
--	let s:root_dir	  = $HOME.'/.vim/'
-+"	let s:root_dir	  = $HOME.'/.vim/'
-+	let s:root_dir	  = $VIMRUNTIME.'/'
-   let s:escfilename = ' \%#[]'
- 	"
- endif
-@@ -64,7 +65,7 @@
- "
- "  Modul global variables (with default values) which can be overridden.
- "
--let s:C_AuthorName     = ""
-+let s:C_AuthorName     = "read README.csupport to learn how to set defaults"
- let s:C_AuthorRef      = ""
- let s:C_Email          = ""
- let s:C_Company        = ""
---- vim63/runtime/doc/tags.rhdefaults	2005-09-08 09:45:25.000000000 +0000
-+++ vim63/runtime/doc/tags	2005-09-08 09:45:45.000000000 +0000
-@@ -4028,6 +4028,7 @@
+--- vim64/runtime/doc/tags.rhcvim	2005-10-15 16:00:26.000000000 +0200
++++ vim64/runtime/doc/tags	2005-12-20 12:08:06.000000000 +0100
+@@ -4033,6 +4033,7 @@
  byte2line()	eval.txt	/*byte2line()*
  bzip2	pi_gzip.txt	/*bzip2*
  c	change.txt	/*c*
@@ -29,7 +8,7 @@
  c-syntax	syntax.txt	/*c-syntax*
  c.vim	syntax.txt	/*c.vim*
  cW	change.txt	/*cW*
-@@ -4272,6 +4273,41 @@
+@@ -4278,6 +4279,41 @@
  csqf	if_cscop.txt	/*csqf*
  cst	if_cscop.txt	/*cst*
  csto	if_cscop.txt	/*csto*
@@ -71,7 +50,7 @@
  csverb	if_cscop.txt	/*csverb*
  ctags	tagsrch.txt	/*ctags*
  ctags-gone	version6.txt	/*ctags-gone*
-@@ -4846,7 +4883,6 @@
+@@ -4857,7 +4893,6 @@
  hebrew.txt	hebrew.txt	/*hebrew.txt*
  help	various.txt	/*help*
  help-context	help.txt	/*help-context*
@@ -79,3 +58,43 @@
  help-translated	various.txt	/*help-translated*
  help-xterm-window	various.txt	/*help-xterm-window*
  help.txt	help.txt	/*help.txt*
+--- vim64/cvim/plugin/c.vim.rhcvim	2005-09-03 12:00:40.000000000 +0200
++++ vim64/cvim/plugin/c.vim	2005-12-20 12:09:37.000000000 +0100
+@@ -48,7 +48,8 @@
+ 	"
+ else
+ 	"
+-	let s:root_dir	  = $HOME.'/.vim/'
++"	let s:root_dir	  = $HOME.'/.vim/'
++	let s:root_dir	  = $VIMRUNTIME.'/'
+   let s:escfilename = ' \%#[]'
+ 	"
+ endif
+@@ -64,7 +65,7 @@
+ "
+ "  Modul global variables (with default values) which can be overridden.
+ "
+-let s:C_AuthorName     = ""
++let s:C_AuthorName     = "read README.csupport to learn how to set defaults"
+ let s:C_AuthorRef      = ""
+ let s:C_Email          = ""
+ let s:C_Company        = ""
+@@ -2465,12 +2466,12 @@
+ "  Automated header insertion
+ "------------------------------------------------------------------------------
+ "
+-if has("autocmd")
+-	autocmd BufNewFile  *.c,*.cc,*.cxx,*.c++,*.C,*.H,*.hh,*.hxx,*.hpp,*.moc,*.tcc,*.inl
+-				\		call C_CommentTemplates('cheader')
+-	autocmd BufNewFile  *.hh,*.hxx,*.hpp
+-				\		call C_CommentTemplates('hheader')
+-endif " has("autocmd")
++" if has("autocmd")
++" 	autocmd BufNewFile  *.c,*.cc,*.cxx,*.c++,*.C,*.H,*.hh,*.hxx,*.hpp,*.moc,*.tcc,*.inl
++" 				\		call C_CommentTemplates('cheader')
++" 	autocmd BufNewFile  *.hh,*.hxx,*.hpp
++" 				\		call C_CommentTemplates('hheader')
++" endif " has("autocmd")
+ "
+ "=====================================================================================
+ " vim: set tabstop=2 shiftwidth=2: 
diff --git a/vim.spec b/vim.spec
index b70aeba..8f42882 100644
--- a/vim.spec
+++ b/vim.spec
@@ -25,7 +25,7 @@
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 1.1
+Release: 2
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2
@@ -202,13 +202,14 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch3100 -p1
 %endif
 
-%build
 %if "%{withcvim}" == "1"
 mkdir cvim
 ( cd cvim; unzip %{SOURCE12}; )
 patch -p1 < %{PATCH3008}
 %endif
 
+
+%build
 cd src
 autoconf
 perl -pi -e "s,\\\$VIMRUNTIME,/usr/share/vim/%{vimdir},g" os_unix.h
@@ -483,6 +484,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Dec 20 2005 Karsten Hopp <karsten@redhat.de> 6.4.004-2
+- disable templates when editing new .c / .h files (#175878)
+
 * Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
 - rebuilt