diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000..7778fb400edde
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+*.a
+*.o
+*.so
+depend
+depend.bak
+lib
+lib64
diff --git a/configs/.gitignore b/configs/.gitignore
new file mode 100644
index 0000000000000..5b9023a315ae7
--- /dev/null
+++ b/configs/.gitignore
@@ -0,0 +1 @@
+current
diff --git a/doxygen/.cvsignore b/doxygen/.gitignore
similarity index 100%
rename from doxygen/.cvsignore
rename to doxygen/.gitignore
diff --git a/progs/demos/.cvsignore b/progs/demos/.gitignore
similarity index 100%
rename from progs/demos/.cvsignore
rename to progs/demos/.gitignore
diff --git a/progs/redbook/.cvsignore b/progs/redbook/.gitignore
similarity index 100%
rename from progs/redbook/.cvsignore
rename to progs/redbook/.gitignore
diff --git a/progs/samples/.cvsignore b/progs/samples/.gitignore
similarity index 100%
rename from progs/samples/.cvsignore
rename to progs/samples/.gitignore
diff --git a/progs/tests/.cvsignore b/progs/tests/.gitignore
similarity index 100%
rename from progs/tests/.cvsignore
rename to progs/tests/.gitignore
diff --git a/progs/xdemos/.cvsignore b/progs/xdemos/.gitignore
similarity index 100%
rename from progs/xdemos/.cvsignore
rename to progs/xdemos/.gitignore
diff --git a/src/glx/x11/.gitignore b/src/glx/x11/.gitignore
new file mode 100644
index 0000000000000..ffc14ab76602c
--- /dev/null
+++ b/src/glx/x11/.gitignore
@@ -0,0 +1 @@
+glcontextmodes.c
diff --git a/src/mesa/.gitignore b/src/mesa/.gitignore
new file mode 100644
index 0000000000000..b83498b1d9ded
--- /dev/null
+++ b/src/mesa/.gitignore
@@ -0,0 +1,2 @@
+*/gen_matypes
+*/matypes.h
diff --git a/src/mesa/drivers/dri/common/xmlpool/.gitignore b/src/mesa/drivers/dri/common/xmlpool/.gitignore
new file mode 100644
index 0000000000000..a5a437849ba34
--- /dev/null
+++ b/src/mesa/drivers/dri/common/xmlpool/.gitignore
@@ -0,0 +1,5 @@
+de
+es
+fr
+nl
+sv
diff --git a/src/mesa/drivers/dri/r300/.gitignore b/src/mesa/drivers/dri/r300/.gitignore
new file mode 100644
index 0000000000000..3773d8ea73f9a
--- /dev/null
+++ b/src/mesa/drivers/dri/r300/.gitignore
@@ -0,0 +1,3 @@
+radeon_chipset.h
+radeon_screen.*
+server
diff --git a/src/mesa/drivers/ggi/default/.cvsignore b/src/mesa/drivers/ggi/default/.gitignore
similarity index 100%
rename from src/mesa/drivers/ggi/default/.cvsignore
rename to src/mesa/drivers/ggi/default/.gitignore
diff --git a/src/mesa/drivers/ggi/display/.cvsignore b/src/mesa/drivers/ggi/display/.gitignore
similarity index 100%
rename from src/mesa/drivers/ggi/display/.cvsignore
rename to src/mesa/drivers/ggi/display/.gitignore
diff --git a/src/mesa/glapi/.cvsignore b/src/mesa/glapi/.gitignore
similarity index 100%
rename from src/mesa/glapi/.cvsignore
rename to src/mesa/glapi/.gitignore