diff --git a/am/guilec b/am/guilec
index 7e3471928..5a7787e71 100644
--- a/am/guilec
+++ b/am/guilec
@@ -8,6 +8,7 @@ nobase_mod_DATA = $(SOURCES) $(NOCOMP_SOURCES)
 ccachedir = $(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/ccache/$(modpath)
 nobase_ccache_DATA = $(GOBJECTS)
 EXTRA_DIST = $(SOURCES) $(NOCOMP_SOURCES)
+ETAGS_ARGS = $(SOURCES) $(NOCOMP_SOURCES)
 
 CLEANFILES = $(GOBJECTS)
 
diff --git a/module/Makefile.am b/module/Makefile.am
index a88df807c..ef5b25f69 100644
--- a/module/Makefile.am
+++ b/module/Makefile.am
@@ -30,6 +30,7 @@ CLEANFILES += ice-9/eval.go
 nobase_mod_DATA += ice-9/eval.scm
 nobase_ccache_DATA += ice-9/eval.go
 EXTRA_DIST += ice-9/eval.scm
+ETAGS_ARGS += ice-9/eval.scm
 
 # We can compile these in any order, but it's fastest if we compile
 # psyntax and boot-9 first, then the compiler itself, then the rest of
@@ -66,6 +67,10 @@ EXTRA_DIST +=					\
   ice-9/test.scm				\
   ice-9/compile-psyntax.scm			\
   ice-9/ChangeLog-2008
+ETAGS_ARGS +=					\
+  ice-9/test.scm				\
+  ice-9/compile-psyntax.scm			\
+  ice-9/ChangeLog-2008
 
 include $(top_srcdir)/am/pre-inst-guile
 ice-9/psyntax-pp.scm.gen: