diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 7c2df3f..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,13 +0,0 @@
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-configure
-configure.ac
-config.cache
-config.h
-config.hin
-config.log
-config.status
-stamp-h 
-stamp-h1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4575e50
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,16 @@
+/aclocal.m4
+/autom4te.cache
+/configure
+/configure.ac
+/config.cache
+/config.h
+/config.hin
+/config.log
+/config.status
+/stamp-h 
+/stamp-h1
+Makefile
+Makefile.in
+*.o
+*.a
+.deps
diff --git a/doc/.cvsignore b/doc/.gitignore
similarity index 55%
rename from doc/.cvsignore
rename to doc/.gitignore
index 99a9b4d..668610c 100644
--- a/doc/.cvsignore
+++ b/doc/.gitignore
@@ -1,7 +1,5 @@
-Makefile
-Makefile.in
 egrep.1
 fgrep.1
-grep.info
+grep.info*
 stamp-vti
 version.texi
diff --git a/intl/.cvsignore b/intl/.cvsignore
deleted file mode 100644
index f3c7a7c..0000000
--- a/intl/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile
diff --git a/lib/.cvsignore b/lib/.cvsignore
deleted file mode 100644
index e995588..0000000
--- a/lib/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.deps
-Makefile
-Makefile.in
diff --git a/lib/posix/.cvsignore b/lib/posix/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/lib/posix/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/m4/.cvsignore b/m4/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/m4/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/po/.cvsignore b/po/.gitignore
similarity index 63%
rename from po/.cvsignore
rename to po/.gitignore
index 5ba9b83..92f9f7e 100644
--- a/po/.cvsignore
+++ b/po/.gitignore
@@ -1,6 +1,4 @@
 *.gmo
-Makefile.in
-Makefile
 POTFILES
 grep.pot
 stamp-cat-id
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index ee921bc..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-Makefile
-Makefile.in
-egrep
-fgrep
-grep
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 0000000..fa4c075
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,3 @@
+/grep
+/egrep
+/fgrep
diff --git a/tests/.cvsignore b/tests/.gitignore
similarity index 73%
rename from tests/.cvsignore
rename to tests/.gitignore
index a357fce..ce503b6 100644
--- a/tests/.cvsignore
+++ b/tests/.gitignore
@@ -1,5 +1,3 @@
-Makefile
-Makefile.in
 bre.script
 ere.script
 khadafy.out
diff --git a/vms/.cvsignore b/vms/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/vms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in