diff --git a/guile-readline/ChangeLog b/guile-readline/ChangeLog
index 1173e7709..374e655e7 100644
--- a/guile-readline/ChangeLog
+++ b/guile-readline/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-30  Neil Jerram  <neil@ossau.uklinux.net>
+
+	* Makefile.am (EXTRA_DIST): Refer to $(ice9_DATA) rather than
+	readline.scm explicitly.
+	(ETAGS_ARGS): Added.
+
 2001-11-04  Stefan Jahn  <stefan@lkcc.org>
 
 	* configure.in (EXTRA_DEFS): Follow-up patch.  Using SCM_IMPORT
diff --git a/guile-readline/Makefile.am b/guile-readline/Makefile.am
index fe35d398b..d9d8d7d31 100644
--- a/guile-readline/Makefile.am
+++ b/guile-readline/Makefile.am
@@ -48,7 +48,8 @@ SUFFIXES = .x
 	$(GUILE_SNARF) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@ \
 	|| { rm $@; false; }
 
-EXTRA_DIST = readline.scm
+EXTRA_DIST = $(ice9_DATA)
+ETAGS_ARGS = $(ice9_DATA)
 
 MKDEP = gcc -M -MG $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 
diff --git a/srfi/ChangeLog b/srfi/ChangeLog
index ab14c474e..abed6ad56 100644
--- a/srfi/ChangeLog
+++ b/srfi/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-30  Neil Jerram  <neil@ossau.uklinux.net>
+
+	* Makefile.am (ETAGS_ARGS): Added.
+
 2001-11-12  Marius Vollmer  <mvo@zagadka.ping.de>
 
 	* srfi-4.c: Use HAVE_LONG_LONG instead of HAVE_LONG_LONGS and test
diff --git a/srfi/Makefile.am b/srfi/Makefile.am
index 996b6aace..38e6cf1a2 100644
--- a/srfi/Makefile.am
+++ b/srfi/Makefile.am
@@ -57,6 +57,7 @@ srfi_DATA = srfi-1.scm \
             srfi-19.scm
 
 EXTRA_DIST = $(srfi_DATA)
+ETAGS_ARGS = $(srfi_DATA)
 
 GUILE_SNARF = ../libguile/guile-snarf