diff --git a/.gitignore b/.gitignore
index 983abda4..4c37222c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,9 +2,12 @@
 /autom4te.cache
 /config.h.in
 /configure
+/config.h
+/config.log
+/config.status
+/libtool
 Makefile.in
-/doc/gpgme.info
-/doc/gpgme.info-1
-/doc/gpgme.info-2
-/doc/stamp-vti
-/doc/version.texi
+Makefile
+stamp-h1
+*.o
+*.lo
diff --git a/doc/.gitignore b/doc/.gitignore
new file mode 100644
index 00000000..a44d7b46
--- /dev/null
+++ b/doc/.gitignore
@@ -0,0 +1,5 @@
+gpgme.info
+gpgme.info-1
+gpgme.info-2
+stamp-vti
+version.texi
diff --git a/lang/cl/.gitignore b/lang/cl/.gitignore
new file mode 100644
index 00000000..abccf9c1
--- /dev/null
+++ b/lang/cl/.gitignore
@@ -0,0 +1 @@
+gpgme.asd
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 00000000..bdf48626
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+gpgme-config
+gpgme-tool
+gpgme.h
+versioninfo.rc
+*.la
diff --git a/tests/.gitignore b/tests/.gitignore
new file mode 100644
index 00000000..e6e6a4a6
--- /dev/null
+++ b/tests/.gitignore
@@ -0,0 +1,10 @@
+.deps
+.libs
+run-export
+run-import
+run-keylist
+run-sign
+run-verify
+t-data
+t-engine-info
+t-version
diff --git a/tests/gpg/.gitignore b/tests/gpg/.gitignore
new file mode 100644
index 00000000..e60bfe51
--- /dev/null
+++ b/tests/gpg/.gitignore
@@ -0,0 +1,30 @@
+.deps
+.libs
+gpg-agent.conf
+gpg.conf
+pubring.gpg
+pubring.gpg~
+secring.gpg
+t-decrypt
+t-decrypt-verify
+t-edit
+t-encrypt
+t-encrypt-large
+t-encrypt-sign
+t-encrypt-sym
+t-eventloop
+t-export
+t-file-name
+t-genkey
+t-gpgconf
+t-import
+t-keylist
+t-keylist-sig
+t-sig-notation
+t-sign
+t-signers
+t-thread1
+t-trustlist
+t-verify
+t-wait
+trustdb.gpg
diff --git a/tests/gpgsm/.gitignore b/tests/gpgsm/.gitignore
new file mode 100644
index 00000000..4f1f113d
--- /dev/null
+++ b/tests/gpgsm/.gitignore
@@ -0,0 +1,17 @@
+.deps
+.libs
+cms-decrypt
+cms-keylist
+gpgsm.conf
+private-keys-v1.d
+pubring.kbx
+pubring.kbx~
+t-decrypt
+t-encrypt
+t-export
+t-genkey
+t-import
+t-keylist
+t-sign
+t-verify
+trustlist.txt
diff --git a/tests/opassuan/.gitignore b/tests/opassuan/.gitignore
new file mode 100644
index 00000000..741a197c
--- /dev/null
+++ b/tests/opassuan/.gitignore
@@ -0,0 +1,3 @@
+.deps
+.libs
+t-command