diff --git a/gramps2/.cvsignore b/gramps2/.cvsignore
index c365ab55d..10da7d168 100644
--- a/gramps2/.cvsignore
+++ b/gramps2/.cvsignore
@@ -1,5 +1,12 @@
-Makefile
+aclocal.m4
 config.cache
 config.log
 config.status
+configure 
+gramps
 gramps.sh
+gramps.spec 
+gramps-mdk.spec 
+Makefile
+Makefile.in 
+autom4te.cache
diff --git a/gramps2/doc/.cvsignore b/gramps2/doc/.cvsignore
new file mode 100644
index 000000000..eec77028b
--- /dev/null
+++ b/gramps2/doc/.cvsignore
@@ -0,0 +1,3 @@
+gramps.1 
+Makefile.in
+Makefile
diff --git a/gramps2/doc/extending-gramps/.cvsignore b/gramps2/doc/extending-gramps/.cvsignore
new file mode 100644
index 000000000..f0ad7e152
--- /dev/null
+++ b/gramps2/doc/extending-gramps/.cvsignore
@@ -0,0 +1,2 @@
+Makefile.in 
+Makefile
diff --git a/gramps2/doc/extending-gramps/C/.cvsignore b/gramps2/doc/extending-gramps/C/.cvsignore
new file mode 100644
index 000000000..f0ad7e152
--- /dev/null
+++ b/gramps2/doc/extending-gramps/C/.cvsignore
@@ -0,0 +1,2 @@
+Makefile.in 
+Makefile
diff --git a/gramps2/doc/gramps-manual/.cvsignore b/gramps2/doc/gramps-manual/.cvsignore
new file mode 100644
index 000000000..3dda72986
--- /dev/null
+++ b/gramps2/doc/gramps-manual/.cvsignore
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile
diff --git a/gramps2/doc/gramps-manual/C/.cvsignore b/gramps2/doc/gramps-manual/C/.cvsignore
new file mode 100644
index 000000000..fef2235fc
--- /dev/null
+++ b/gramps2/doc/gramps-manual/C/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+Makefile.in
+omf_timestamp 
+*.omf.out
diff --git a/gramps2/doc/gramps-manual/de/.cvsignore b/gramps2/doc/gramps-manual/de/.cvsignore
new file mode 100644
index 000000000..fef2235fc
--- /dev/null
+++ b/gramps2/doc/gramps-manual/de/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+Makefile.in
+omf_timestamp 
+*.omf.out
diff --git a/gramps2/doc/gramps-manual/fr/.cvsignore b/gramps2/doc/gramps-manual/fr/.cvsignore
new file mode 100644
index 000000000..fef2235fc
--- /dev/null
+++ b/gramps2/doc/gramps-manual/fr/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+Makefile.in
+omf_timestamp 
+*.omf.out
diff --git a/gramps2/doc/gramps-manual/hu/.cvsignore b/gramps2/doc/gramps-manual/hu/.cvsignore
new file mode 100644
index 000000000..fef2235fc
--- /dev/null
+++ b/gramps2/doc/gramps-manual/hu/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+Makefile.in
+omf_timestamp 
+*.omf.out
diff --git a/gramps2/doc/gramps-manual/ru/.cvsignore b/gramps2/doc/gramps-manual/ru/.cvsignore
new file mode 100644
index 000000000..fef2235fc
--- /dev/null
+++ b/gramps2/doc/gramps-manual/ru/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+Makefile.in
+omf_timestamp 
+*.omf.out
diff --git a/gramps2/example/.cvsignore b/gramps2/example/.cvsignore
new file mode 100644
index 000000000..f0ad7e152
--- /dev/null
+++ b/gramps2/example/.cvsignore
@@ -0,0 +1,2 @@
+Makefile.in 
+Makefile
diff --git a/gramps2/example/gramps/.cvsignore b/gramps2/example/gramps/.cvsignore
new file mode 100644
index 000000000..3dda72986
--- /dev/null
+++ b/gramps2/example/gramps/.cvsignore
@@ -0,0 +1,2 @@
+Makefile.in
+Makefile
diff --git a/gramps2/src/.cvsignore b/gramps2/src/.cvsignore
index 58c975256..0c35ac192 100644
--- a/gramps2/src/.cvsignore
+++ b/gramps2/src/.cvsignore
@@ -1,6 +1,8 @@
 Makefile
+Makefile.in
 *.pyc
 *.pyo
+const.py
 gramps.strings
 glade.c
 .xvpics
diff --git a/gramps2/src/calendars/.cvsignore b/gramps2/src/calendars/.cvsignore
index 9c3a850ac..a3faf7a58 100644
--- a/gramps2/src/calendars/.cvsignore
+++ b/gramps2/src/calendars/.cvsignore
@@ -1,4 +1,5 @@
 Makefile
+Makefile.in
 *.pyc
 *.pyo
 *.gladep
diff --git a/gramps2/src/data/.cvsignore b/gramps2/src/data/.cvsignore
index f3c7a7c5d..282522db0 100644
--- a/gramps2/src/data/.cvsignore
+++ b/gramps2/src/data/.cvsignore
@@ -1 +1,2 @@
 Makefile
+Makefile.in
diff --git a/gramps2/src/data/templates/.cvsignore b/gramps2/src/data/templates/.cvsignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/gramps2/src/data/templates/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/gramps2/src/docgen/.cvsignore b/gramps2/src/docgen/.cvsignore
index 04ab68864..c3ec8f1b3 100644
--- a/gramps2/src/docgen/.cvsignore
+++ b/gramps2/src/docgen/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
+Makefile.in
 *.pyc
 *.pyo
diff --git a/gramps2/src/filters/.cvsignore b/gramps2/src/filters/.cvsignore
index 04ab68864..c3ec8f1b3 100644
--- a/gramps2/src/filters/.cvsignore
+++ b/gramps2/src/filters/.cvsignore
@@ -1,3 +1,4 @@
 Makefile
+Makefile.in
 *.pyc
 *.pyo
diff --git a/gramps2/src/plugins/.cvsignore b/gramps2/src/plugins/.cvsignore
index 9c3a850ac..a3faf7a58 100644
--- a/gramps2/src/plugins/.cvsignore
+++ b/gramps2/src/plugins/.cvsignore
@@ -1,4 +1,5 @@
 Makefile
+Makefile.in
 *.pyc
 *.pyo
 *.gladep
diff --git a/gramps2/src/po/.cvsignore b/gramps2/src/po/.cvsignore
new file mode 100644
index 000000000..cca26cc84
--- /dev/null
+++ b/gramps2/src/po/.cvsignore
@@ -0,0 +1,3 @@
+Makefile.in 
+Makefile
+*.mo