diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index f26f7e8..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,24 +0,0 @@
-Makefile
-Makefile.am
-Makefile.in
-aclocal.m4
-autom4te.cache
-config.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-configure.in
-depcomp
-install-sh
-libtool
-ltconfig
-ltmain.sh
-missing
-mkinstalldirs
-stamp-h*
-*.pot
-Makefile.am.common
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..aab5d58
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,19 @@
+# autotools
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache/
+config.guess
+config.log
+config.status
+config.sub
+configure
+install-sh
+missing
+# devtools
+.dep
+*.ami
+/Makefile.am
+/Makefile.am.common
+configure.in
+doc/autodocs/*.html
diff --git a/doc/.cvsignore b/doc/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/doc/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/doc/autodocs/.cvsignore b/doc/autodocs/.cvsignore
deleted file mode 100644
index 2f083ef..0000000
--- a/doc/autodocs/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-*.html
diff --git a/package/.cvsignore b/package/.cvsignore
deleted file mode 100644
index 65d0b1a..0000000
--- a/package/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.spec
-*.bz2
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 31486da..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-.dep
-*.ybc
diff --git a/testsuite/.cvsignore b/testsuite/.cvsignore
deleted file mode 100644
index 24f1e26..0000000
--- a/testsuite/.cvsignore
+++ /dev/null
@@ -1,11 +0,0 @@
-Makefile
-Makefile.in
-site.exp
-*.sum
-*.log
-tmp.out*
-tmp.err*
-tmp.log*
-config
-run
-*.test
diff --git a/testsuite/.gitignore b/testsuite/.gitignore
new file mode 100644
index 0000000..30f97be
--- /dev/null
+++ b/testsuite/.gitignore
@@ -0,0 +1,12 @@
+# dejagnu
+site.exp
+# * is the rpm name
+*.log
+*.sum
+*.test/
+# * are test cases
+tmp.out*
+tmp.err*
+# harness
+config/
+run/