diff --git a/.cvsignore b/.cvsignore
index 24aa42bcc..994f72bbc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,18 +1,19 @@
 Makefile
 Makefile.in
 aclocal.m4
+check-guile
+check-guile.log
 config.build-subdirs
 config.cache
 config.guess
-config.sub
 config.h.in
 config.log
 config.status
+config.sub
 configure
 guile-*.tar.gz
+guile-tools
+libltdl
 libtool
 ltconfig
 ltmain.sh
-check-guile
-check-guile.log
-guile-tools
diff --git a/ChangeLog b/ChangeLog
index 9387fc1ac..370fdf351 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-08-07  Marius Vollmer  <mvo@zagadka.ping.de>
+
+	* Makefile.am (EXTRA_DIST, SUBDIRS): Move test-suite from
+	EXTRA_DIST to SUBDIRS.
+
+	* configure.in: Added "test-suite/Makefile.am".
+
 2001-08-01  Marius Vollmer  <mvo@zagadka.ping.de>
 
 	* configure.in: Added `--disable-linuxthreads' option and do not
diff --git a/examples/box-dynamic-module/.cvsignore b/examples/box-dynamic-module/.cvsignore
index 282522db0..44fa42a5d 100644
--- a/examples/box-dynamic-module/.cvsignore
+++ b/examples/box-dynamic-module/.cvsignore
@@ -1,2 +1,5 @@
+.libs
 Makefile
 Makefile.in
+box.lo
+libbox-module.la
diff --git a/examples/box-dynamic/.cvsignore b/examples/box-dynamic/.cvsignore
index 282522db0..4f85b596f 100644
--- a/examples/box-dynamic/.cvsignore
+++ b/examples/box-dynamic/.cvsignore
@@ -1,2 +1,5 @@
+.libs
 Makefile
 Makefile.in
+box.lo
+libbox.la
diff --git a/examples/box-module/.cvsignore b/examples/box-module/.cvsignore
index 051d1bd50..835d06e72 100644
--- a/examples/box-module/.cvsignore
+++ b/examples/box-module/.cvsignore
@@ -1,3 +1,5 @@
+.deps
+.libs
 Makefile
 Makefile.in
-.deps
+box
diff --git a/examples/box/.cvsignore b/examples/box/.cvsignore
index 051d1bd50..835d06e72 100644
--- a/examples/box/.cvsignore
+++ b/examples/box/.cvsignore
@@ -1,3 +1,5 @@
+.deps
+.libs
 Makefile
 Makefile.in
-.deps
+box
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 8bb81eb1f..589d7f1f7 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-07  Marius Vollmer  <mvo@zagadka.ping.de>
+
+	* Makefile.am (EXTRA_DIST): Distribute ChangeLog-1996-1999 and
+	ChangeLog-2000.  Thanks to Daniel Skarda!
+
 2001-08-07  Michael Livshin  <mlivshin@bigfoot.com>
 
 	* guile-snarf-docs-texi.in: don't call the tokenizer here, we now
diff --git a/test-suite/.cvsignore b/test-suite/.cvsignore
index 7bc585c3d..4a9906eca 100644
--- a/test-suite/.cvsignore
+++ b/test-suite/.cvsignore
@@ -1,3 +1,5 @@
+Makefile
+Makefile.in
 guile.log
 tmp1
 tmp2
diff --git a/test-suite/ChangeLog b/test-suite/ChangeLog
index 4c59ef578..ab281f5d4 100644
--- a/test-suite/ChangeLog
+++ b/test-suite/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-07  Marius Vollmer  <mvo@zagadka.ping.de>
+
+	* Makefile.am: New file, to control distribution of the
+	test-suite.
+
 2001-08-02  Thien-Thi Nguyen  <ttn@revel.glug.org>
 
 	* tests/getopt-long.test: New file.