diff --git a/.cvsignore b/.cvsignore
index e29d48cf08bc308f4a5f59e60640046f3ea559af..f8189aa957aadc0ce5a9db06f3133d662ef4646e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,29 +1,12 @@
-*.d
-*.bb
-*.bbg
-*.da
-*.gcov
 .deps
-.dist_headers
 Makefile
-Makefile.am
 Makefile.in
-bf_test
+aclocal.m4
 config.cache
+config.h
 config.h.in
 config.log
 config.status
 configure
-configure.scan
-desQuickCore.c
-desQuickFips.c
-desSmallCore.c
-desSmallFips.c
-desTest
-desdata
-generate_q
-keymap.h
-parity.h
-rijndael_test
-rotors.h
-twofish_test
+stamp-h
+stamp-h.in
diff --git a/.gitignore b/.gitignore
index 7f65ad60c28b0fd2b19f657cefe9c03bd331b330..1c078812e90e84296b0123a513d39ec0a72ed262 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,32 +30,15 @@ _$*
 *.elc
 *.ln
 core
-/*.d
-/*.bb
-/*.bbg
-/*.da
-/*.gcov
 /.deps
-/.dist_headers
 /Makefile
-/Makefile.am
 /Makefile.in
-/bf_test
+/aclocal.m4
 /config.cache
+/config.h
 /config.h.in
 /config.log
 /config.status
 /configure
-/configure.scan
-/desQuickCore.c
-/desQuickFips.c
-/desSmallCore.c
-/desSmallFips.c
-/desTest
-/desdata
-/generate_q
-/keymap.h
-/parity.h
-/rijndael_test
-/rotors.h
-/twofish_test
+/stamp-h
+/stamp-h.in
diff --git a/testsuite/.cvsignore b/testsuite/.cvsignore
new file mode 100644
index 0000000000000000000000000000000000000000..64bd63f8406e1c812594da7337d1426dbbceb1d9
--- /dev/null
+++ b/testsuite/.cvsignore
@@ -0,0 +1,9 @@
+.deps
+Makefile
+Makefile.in
+aes-test
+aes-test.c
+arcfour-test
+arcfour-test.c
+md5-test
+md5-test.c
diff --git a/testsuite/.gitignore b/testsuite/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..8b360324c78c59826bebb98e0bf5f8f6c98c19a5
--- /dev/null
+++ b/testsuite/.gitignore
@@ -0,0 +1,9 @@
+/.deps
+/Makefile
+/Makefile.in
+/aes-test
+/aes-test.c
+/arcfour-test
+/arcfour-test.c
+/md5-test
+/md5-test.c