diff --git a/vim.spec b/vim.spec
index d871a05..5c50421 100644
--- a/vim.spec
+++ b/vim.spec
@@ -26,7 +26,7 @@
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 1
+Release: 2
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2
@@ -491,6 +491,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Oct 11 2004 Karsten Hopp <karsten@redhat.de> 6.3.030-2 
+- add cscope to vimrc so that cscope DB will be used 
+  automatically when available
+
 * Fri Oct 08 2004 Karsten Hopp <karsten@redhat.de> 6.3.030-2
 - patchlevel 30
 
diff --git a/vimrc b/vimrc
index 34ec86a..cc198a1 100644
--- a/vimrc
+++ b/vimrc
@@ -22,6 +22,21 @@ if has("autocmd")
   \ endif
 endif
 
+if has("cscope")
+   set csprg=/usr/bin/cscope
+   set csto=0
+   set cst
+   set nocsverb
+   " add any database in current directory
+   if filereadable("cscope.out")
+      cs add cscope.out
+   " else add database pointed to by environment
+   elseif $CSCOPE_DB != ""
+      cs add $CSCOPE_DB
+   endif
+   set csverb
+endif
+
 " Switch syntax highlighting on, when the terminal has colors
 " Also switch on highlighting the last used search pattern.
 if &t_Co > 2 || has("gui_running")