diff --git a/.dir-locals.el b/.dir-locals.el
index 21bbe48a..58a06c12 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -21,5 +21,5 @@
              (sh-indentation . 4)))
  (awk-mode . ((c-basic-offset . 8)))
  (nil . ((indent-tabs-mode . nil)
-         (tab-width . 8)
+         (tab-width . 4)
          (fill-column . 79))) )
diff --git a/.vimrc b/.vimrc
index 0cf0f062..a6e36b4c 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,15 +1,15 @@
-" Vim can use per directory configuration files like this. 
+" Vim can use per directory configuration files like this.
 " To enable that feature two lines are needed in your ~/.vimrc
 " set exrc   " enables per-directory .vimrc files
 " set secure   " disable unsafe commands in local .vimrc files
 " Characters width is set to 109 for .c and XML but for everything else 79.
-" If you update this file make sure to update .dir-locals.el & .editorconfig 
+" If you update this file make sure to update .dir-locals.el & .editorconfig
 
-set tabstop=8
-set shiftwidth=8
+set tabstop=4
+set shiftwidth=4
 set expandtab
 set makeprg=GCC_COLORS=\ make
 set tw=79
 au BufRead,BufNewFile *.xml set tw=109 shiftwidth=2 smarttab
 au FileType sh set tw=80 shiftwidth=4 smarttab
-au FileType c set tw=109
+au FileType c set tw=109 shiftwidth=8 tabstop=8 smarttab expandtab