diff --git a/.cvsignore b/.gitignore
similarity index 97%
rename from .cvsignore
rename to .gitignore
index 407e92fa..5545617e 100644
--- a/.cvsignore
+++ b/.gitignore
@@ -18,6 +18,8 @@ ltmain.sh
 missing
 stamp-h1
 
+*.o
+*~
 root
 tags
 cscope.out
diff --git a/contrib/.cvsignore b/contrib/.gitignore
similarity index 100%
rename from contrib/.cvsignore
rename to contrib/.gitignore
diff --git a/doc/.cvsignore b/doc/.gitignore
similarity index 100%
rename from doc/.cvsignore
rename to doc/.gitignore
diff --git a/etc/.cvsignore b/etc/.gitignore
similarity index 100%
rename from etc/.cvsignore
rename to etc/.gitignore
diff --git a/etc/abs/.cvsignore b/etc/abs/.cvsignore
deleted file mode 100644
index 282522db..00000000
--- a/etc/abs/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/etc/pacman.d/.cvsignore b/etc/pacman.d/.gitignore
similarity index 100%
rename from etc/pacman.d/.cvsignore
rename to etc/pacman.d/.gitignore
diff --git a/lib/libalpm/.cvsignore b/lib/libalpm/.gitignore
similarity index 100%
rename from lib/libalpm/.cvsignore
rename to lib/libalpm/.gitignore
diff --git a/lib/libalpm/po/.cvsignore b/lib/libalpm/po/.gitignore
similarity index 100%
rename from lib/libalpm/po/.cvsignore
rename to lib/libalpm/po/.gitignore
diff --git a/pactest/.cvsignore b/pactest/.gitignore
similarity index 100%
rename from pactest/.cvsignore
rename to pactest/.gitignore
diff --git a/scripts/.cvsignore b/scripts/.cvsignore
deleted file mode 100644
index 282522db..00000000
--- a/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/pacman/.cvsignore b/src/pacman/.gitignore
similarity index 100%
rename from src/pacman/.cvsignore
rename to src/pacman/.gitignore
diff --git a/src/pacman/po/.cvsignore b/src/pacman/po/.gitignore
similarity index 100%
rename from src/pacman/po/.cvsignore
rename to src/pacman/po/.gitignore
diff --git a/src/util/.cvsignore b/src/util/.gitignore
similarity index 100%
rename from src/util/.cvsignore
rename to src/util/.gitignore