diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 00000000..4b838056
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1,9 @@
+Makefile Makefile.in
+aclocal.m4 config.h.in
+config.h
+configure
+libtool
+config.log config.status
+stamp-h
+stamp-h.in
+stamp-h1
diff --git a/assuan/.cvsignore b/assuan/.cvsignore
new file mode 100644
index 00000000..564fd58c
--- /dev/null
+++ b/assuan/.cvsignore
@@ -0,0 +1,2 @@
+Makefile.in Makefile .deps
+assuan-errors.c
diff --git a/bonobo/.cvsignore b/bonobo/.cvsignore
new file mode 100644
index 00000000..3f85e61b
--- /dev/null
+++ b/bonobo/.cvsignore
@@ -0,0 +1 @@
+Makefile.in Makefile .deps
diff --git a/complus/.cvsignore b/complus/.cvsignore
new file mode 100644
index 00000000..3f85e61b
--- /dev/null
+++ b/complus/.cvsignore
@@ -0,0 +1 @@
+Makefile.in Makefile .deps
diff --git a/doc/.cvsignore b/doc/.cvsignore
new file mode 100644
index 00000000..aa61a42e
--- /dev/null
+++ b/doc/.cvsignore
@@ -0,0 +1 @@
+Makefile.in Makefile
diff --git a/gpgme/.cvsignore b/gpgme/.cvsignore
new file mode 100644
index 00000000..9d8fd2d1
--- /dev/null
+++ b/gpgme/.cvsignore
@@ -0,0 +1,6 @@
+Makefile.in Makefile .deps .libs
+*.lo *.la
+errors.c
+gpgme-config
+status-table.h
+
diff --git a/gpgmeplug/.cvsignore b/gpgmeplug/.cvsignore
new file mode 100644
index 00000000..95fd8eed
--- /dev/null
+++ b/gpgmeplug/.cvsignore
@@ -0,0 +1,2 @@
+Makefile.in Makefile .deps .libs
+*.lo *.la
diff --git a/jnlib/.cvsignore b/jnlib/.cvsignore
new file mode 100644
index 00000000..3f85e61b
--- /dev/null
+++ b/jnlib/.cvsignore
@@ -0,0 +1 @@
+Makefile.in Makefile .deps
diff --git a/tests/.cvsignore b/tests/.cvsignore
new file mode 100644
index 00000000..183fe91f
--- /dev/null
+++ b/tests/.cvsignore
@@ -0,0 +1 @@
+Makefile.in Makefile .deps .libs t-data t-version
diff --git a/tests/gpg/.cvsignore b/tests/gpg/.cvsignore
new file mode 100644
index 00000000..c6c0c8eb
--- /dev/null
+++ b/tests/gpg/.cvsignore
@@ -0,0 +1,7 @@
+Makefile Makefile.in .deps .libs
+Alpha Bravo Charlie Delta Echo Foxtrot Golf Hotel India Juliet Kilo
+Lima Mike November Oscar Papa Quebec Romeo Sierra Tango Uniform Victor
+Whisky XRay Yankee Zulu
+pubring.gpg secring.gpg random_seed trustdb.gpg
+t-decrypt t-decrypt-verify t-encrypt t-export t-genkey t-import
+t-keylist t-sign t-signers t-trustlist t-verify
diff --git a/tests/gpgsm/.cvsignore b/tests/gpgsm/.cvsignore
new file mode 100644
index 00000000..1d40567d
--- /dev/null
+++ b/tests/gpgsm/.cvsignore
@@ -0,0 +1 @@
+Makefile Makefile.in .deps .libs