diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 3dfd0e186f15d5659ee2e15fbe623f8d742cbb97..7068525a7061753ce01fef51f8d08627ffd38811 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+
+2017-01-05  Martin Liska  <mliska@suse.cz>
+
+	* vimrc: Update indentation definition.
+
 2017-01-04  Jakub Jelinek  <jakub@redhat.com>
 
 	* update-copyright.py (GCCCmdLine): Add include, libcc1, libiberty,
diff --git a/contrib/vimrc b/contrib/vimrc
index 34e8f3543f90ad1b7eac9d35bbdf69c3600d38e9..7c0c5878c63b21d1ad7345273142b6a60e5295b9 100644
--- a/contrib/vimrc
+++ b/contrib/vimrc
@@ -35,7 +35,10 @@ function! SetStyle()
   let l:c_exts = ['c', 'h', 'cpp', 'cc', 'C', 'H', 'def', 'java']
   if index(l:c_exts, l:ext) != -1
     setlocal cindent
+    setlocal tabstop=8
     setlocal softtabstop=2
+    setlocal shiftwidth=2
+    setlocal noexpandtab
     setlocal cinoptions=>4,n-2,{2,^-2,:2,=2,g0,f0,h2,p4,t0,+2,(0,u0,w1,m0
     setlocal textwidth=80
     setlocal formatoptions-=ro formatoptions+=cqlt