diff --git a/.cvsignore b/.cvsignore
index 692f980e2849acc9aa0ade2bf58c0de221a3fea6..f736d5db97438f04dd1244ed260b7fe0e323d230 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,11 +1,10 @@
 *.s
 *.tar.gz
 *.tar.gz.asc
-.deps
+*.d
+*.po
 .lib
 Makefile
-Makefile.in
-aclocal.m4
 aesdata
 autom4te.cache
 config.cache
diff --git a/.gitignore b/.gitignore
index dfd505cd31e4986dea7cc6e8affd34f0a0898d26..f502cdd99a6427c812ccf40375afef166043268a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,11 +33,10 @@ core
 /*.s
 /*.tar.gz
 /*.tar.gz.asc
-/.deps
+/*.d
+/*.po
 /.lib
 /Makefile
-/Makefile.in
-/aclocal.m4
 /aesdata
 /autom4te.cache
 /config.cache
diff --git a/examples/.cvsignore b/examples/.cvsignore
index 41ff38b4783de5358e0d43da35d2852e1472ef10..1d1f49d3d1ae48401ae923353d6a02b745e3a925 100644
--- a/examples/.cvsignore
+++ b/examples/.cvsignore
@@ -1,6 +1,5 @@
-.deps
+*.d
 Makefile
-Makefile.in
 nettle-benchmark
 rsa-decrypt
 rsa-encrypt
diff --git a/examples/.gitignore b/examples/.gitignore
index 133bc9241ba1a6c11f2b9ff23a43662c77393297..15e92a23e8ca87cc44a6b8248151a389dfc9cee0 100644
--- a/examples/.gitignore
+++ b/examples/.gitignore
@@ -1,6 +1,5 @@
-/.deps
+/*.d
 /Makefile
-/Makefile.in
 /nettle-benchmark
 /rsa-decrypt
 /rsa-encrypt
diff --git a/testsuite/.cvsignore b/testsuite/.cvsignore
index 64dc9eb3b9a450d1961a2539e0c61e5d25ab000a..468db812d9bc2924b4608ac5c200bd2b57bc0da9 100644
--- a/testsuite/.cvsignore
+++ b/testsuite/.cvsignore
@@ -1,6 +1,5 @@
-.deps
+*.d
 Makefile
-Makefile.in
 aes-test
 arcfour-test
 arctwo-test
diff --git a/testsuite/.gitignore b/testsuite/.gitignore
index cbe1f49edbbcb4d1a1baa34e09333be51bb6eabc..44801ecbceeb28eb52efe80cc187fe32a337826b 100644
--- a/testsuite/.gitignore
+++ b/testsuite/.gitignore
@@ -1,6 +1,5 @@
-/.deps
+/*.d
 /Makefile
-/Makefile.in
 /aes-test
 /arcfour-test
 /arctwo-test
diff --git a/tools/.cvsignore b/tools/.cvsignore
index b8d1a307e286355d78697a50b3a53eb77cced0c1..7edaf98a0459f19b8d50e2620114d15aec9f06c1 100644
--- a/tools/.cvsignore
+++ b/tools/.cvsignore
@@ -1,5 +1,4 @@
-.deps
+*.d
 Makefile
-Makefile.in
 nettle-lfib-stream
 sexp-conv
diff --git a/tools/.gitignore b/tools/.gitignore
index 4c171461259ba4b5f12ed3df7b12d41fe3abb9de..bc6f198fded58719455b9f0dda07ba1bf5b4ab47 100644
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -1,5 +1,4 @@
-/.deps
+/*.d
 /Makefile
-/Makefile.in
 /nettle-lfib-stream
 /sexp-conv