diff --git a/.cvsignore b/.gitignore
similarity index 84%
rename from .cvsignore
rename to .gitignore
index fab894e3f..aaa9f03b1 100644
--- a/.cvsignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ Makefile.in
 aclocal.m4
 autom4te.cache
 cairo.pc
+compile
 config.cache
 config.guess
 config.h
@@ -11,10 +12,13 @@ config.log
 config.status
 config.sub
 configure
+depcomp
+install-sh
 libtool
 ltmain.sh
+missing
 releases
 stamp-h
 stamp-h1
 stamp-h.in
-
+*~
diff --git a/doc/.cvsignore b/doc/.gitignore
similarity index 87%
rename from doc/.cvsignore
rename to doc/.gitignore
index 282522db0..23c1897f1 100644
--- a/doc/.cvsignore
+++ b/doc/.gitignore
@@ -1,2 +1,3 @@
 Makefile
 Makefile.in
+*~
diff --git a/doc/public/.cvsignore b/doc/public/.gitignore
similarity index 98%
rename from doc/public/.cvsignore
rename to doc/public/.gitignore
index 2fac445dd..bd6996b82 100644
--- a/doc/public/.cvsignore
+++ b/doc/public/.gitignore
@@ -14,3 +14,4 @@ cairo.signals
 html
 xml
 version.xml
+*~
diff --git a/doc/public/tmpl/.cvsignore b/doc/public/tmpl/.gitignore
similarity index 66%
rename from doc/public/tmpl/.cvsignore
rename to doc/public/tmpl/.gitignore
index 844dc52df..5cc8a01e7 100644
--- a/doc/public/tmpl/.cvsignore
+++ b/doc/public/tmpl/.gitignore
@@ -1 +1,3 @@
 cairo-unused.sgml
+*.bak
+*~
diff --git a/doc/tutorial/slides/.cvsignore b/doc/tutorial/slides/.gitignore
similarity index 96%
rename from doc/tutorial/slides/.cvsignore
rename to doc/tutorial/slides/.gitignore
index 02a98448c..72a67a02c 100644
--- a/doc/tutorial/slides/.cvsignore
+++ b/doc/tutorial/slides/.gitignore
@@ -4,4 +4,4 @@ tutorial-???.svg
 tutorial-index.xml
 tutorial.pdf
 index.html
-
+*~
diff --git a/doc/tutorial/src/.cvsignore b/doc/tutorial/src/.gitignore
similarity index 84%
rename from doc/tutorial/src/.cvsignore
rename to doc/tutorial/src/.gitignore
index 59488b844..68af59e73 100644
--- a/doc/tutorial/src/.cvsignore
+++ b/doc/tutorial/src/.gitignore
@@ -4,4 +4,5 @@
 *-xlib
 *.pdf
 *.png
-
+*.o
+*~
diff --git a/pixman/.cvsignore b/pixman/.gitignore
similarity index 98%
rename from pixman/.cvsignore
rename to pixman/.gitignore
index a3d5a36ac..55c6a0471 100644
--- a/pixman/.cvsignore
+++ b/pixman/.gitignore
@@ -17,3 +17,4 @@ releases
 stamp-h
 stamp-h.in
 stamp-h1
+*~
diff --git a/pixman/src/.cvsignore b/pixman/src/.gitignore
similarity index 89%
rename from pixman/src/.cvsignore
rename to pixman/src/.gitignore
index c11da0d03..77798ce8a 100644
--- a/pixman/src/.cvsignore
+++ b/pixman/src/.gitignore
@@ -6,3 +6,5 @@ Makefile.in
 *.lo
 .libs
 .deps
+*.o
+*~
diff --git a/src/.cvsignore b/src/.gitignore
similarity index 92%
rename from src/.cvsignore
rename to src/.gitignore
index f02bc0f8a..eac847cd8 100644
--- a/src/.cvsignore
+++ b/src/.gitignore
@@ -9,3 +9,5 @@ Makefile.in
 *.loT
 cairo-features.h
 cairo.def
+*.o
+*~
diff --git a/test/.cvsignore b/test/.gitignore
similarity index 99%
rename from test/.cvsignore
rename to test/.gitignore
index 9071ad67b..5173349b2 100644
--- a/test/.cvsignore
+++ b/test/.gitignore
@@ -112,3 +112,5 @@ xlib-surface
 *.la
 *.lo
 *.log
+*.o
+*~