diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000000..009f6cfb9f
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1,8 @@
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+config.log
+config.status
+configure
+libtool
diff --git a/config/.cvsignore b/config/.cvsignore
new file mode 100644
index 0000000000..f7cc056753
--- /dev/null
+++ b/config/.cvsignore
@@ -0,0 +1,9 @@
+Makefile
+Makefile.in
+config.guess
+config.sub
+depcomp
+install-sh
+ltmain.sh
+missing
+mkinstalldirs
diff --git a/src/.cvsignore b/src/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/src/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/include/.cvsignore b/src/include/.cvsignore
new file mode 100644
index 0000000000..7911e9eb66
--- /dev/null
+++ b/src/include/.cvsignore
@@ -0,0 +1,5 @@
+Makefile
+Makefile.in
+cmpi_config.h
+cmpi_config.h.in
+stamp-h1
diff --git a/src/mpi/.cvsignore b/src/mpi/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/src/mpi/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/mpi/communicator/.cvsignore b/src/mpi/communicator/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/src/mpi/communicator/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/mpi/datatype/.cvsignore b/src/mpi/datatype/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/src/mpi/datatype/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/mpi/group/.cvsignore b/src/mpi/group/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/src/mpi/group/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/mpi/info/.cvsignore b/src/mpi/info/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/src/mpi/info/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/mpi/op/.cvsignore b/src/mpi/op/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/src/mpi/op/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/mpi/proc/.cvsignore b/src/mpi/proc/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/src/mpi/proc/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/mpi/request/.cvsignore b/src/mpi/request/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/src/mpi/request/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/tools/.cvsignore b/src/tools/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/src/tools/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/tools/wrappers/.cvsignore b/src/tools/wrappers/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/src/tools/wrappers/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/test/.cvsignore b/test/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/test/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/test/unit/.cvsignore b/test/unit/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/test/unit/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/test/unit/mpi/.cvsignore b/test/unit/mpi/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/test/unit/mpi/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/test/unit/mpi/communicator/.cvsignore b/test/unit/mpi/communicator/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/test/unit/mpi/communicator/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/test/unit/mpi/datatype/.cvsignore b/test/unit/mpi/datatype/.cvsignore
new file mode 100644
index 0000000000..282522db03
--- /dev/null
+++ b/test/unit/mpi/datatype/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in