diff --git a/.gitignore b/.gitignore
index d27424ba9af..055d59511d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,7 +78,6 @@ systemadm
 *.8
 *.html
 *~
-*.tar.gz
 *.o
 *.lo
 *.a
@@ -102,8 +101,5 @@ stamp-*
 *.stamp
 /Makefile
 ltmain.sh
-*.tar.bz2
-*.tar.gz
 *.tar.xz
 libtool
-.vimrc
diff --git a/.vimrc b/.vimrc
new file mode 100644
index 00000000000..366fbdca4ba
--- /dev/null
+++ b/.vimrc
@@ -0,0 +1,4 @@
+" 'set exrc' in ~/.vimrc will read .vimrc from the current directory
+set tabstop=8
+set shiftwidth=8
+set expandtab