diff --git a/.cvsignore b/.gitignore
similarity index 84%
rename from .cvsignore
rename to .gitignore
index ad6c4ed..8c1c41c 100644
--- a/.cvsignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 .autoconf_trace
+ChangeLog
+INSTALL
 Makefile
 Makefile.in
 autom4te.cache
@@ -14,9 +16,13 @@ config.sub
 configure
 configure.lineno
 configure-stamp
+depcomp
+install-sh
 isync.spec
 isync-*.tar.gz
+missing
 patch-stamp
 stamp-h
 stamp-h.in
 stamp-h1
+*~
diff --git a/Makefile.am b/Makefile.am
index 0dff87b..f83fb4f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -64,7 +64,7 @@ deb-clean:
 distdir distclean: deb-clean
 
 dist-hook:
-	find $(distdir)/debian \( -name CVS -o -name .cvsignore -o -name .#\*# -o -type l \) -print0 | xargs -0r rm -rf
+	find $(distdir)/debian \( -name .git -o -name .gitignore -o -name .#\*# -o -type l \) -print0 | xargs -0r rm -rf
 
 dist-sign: dist
 	gpg -b -a $(PACKAGE)-$(VERSION).tar.gz
diff --git a/src/.cvsignore b/src/.gitignore
similarity index 91%
rename from src/.cvsignore
rename to src/.gitignore
index d6cbd59..25ae8f6 100644
--- a/src/.cvsignore
+++ b/src/.gitignore
@@ -3,3 +3,4 @@ Makefile
 Makefile.in
 mbsync
 mdconvert
+*.o
diff --git a/src/compat/.cvsignore b/src/compat/.gitignore
similarity index 89%
rename from src/compat/.cvsignore
rename to src/compat/.gitignore
index 5630809..8b6b13f 100644
--- a/src/compat/.cvsignore
+++ b/src/compat/.gitignore
@@ -2,3 +2,4 @@
 Makefile
 Makefile.in
 isync
+*.o