diff --git a/gcc/treelang/ChangeLog b/gcc/treelang/ChangeLog
index 3abf02dbbc65..6159f087ea4c 100644
--- a/gcc/treelang/ChangeLog
+++ b/gcc/treelang/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-26  Jason Merrill  <jason@redhat.com>
+
+	* Make-lang.in (treelang.tags): Create TAGS.sub files in each
+	directory and TAGS files that include them for each front end.
+
 2003-11-21  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* .cvsignore: Delete.
diff --git a/gcc/treelang/Make-lang.in b/gcc/treelang/Make-lang.in
index 1b056c4242c2..00816d0b93ff 100644
--- a/gcc/treelang/Make-lang.in
+++ b/gcc/treelang/Make-lang.in
@@ -59,7 +59,7 @@ GCC_EXTRAS = -B./ -B$(build_tooldir)/bin/ -isystem $(build_tooldir)/include
 
 TREE_GENERATED = $(parsedir)/treelang/lex.c $(parsedir)/treelang/parse.c \
   $(parsedir)/treelang/parse.h $(parsedir)/treelang/parse.output \
-  $(parsedir)/treelang/TAGS
+  $(parsedir)/treelang/TAGS $(parsedir)/treelang/TAGS.sub
 
 TREE_EXES = tree1
 
@@ -147,7 +147,8 @@ treelang.start.encap:
 treelang.rest.encap:
 
 treelang.tags: force
-	cd $(srcdir)/treelang; etags *.y *.l *.c *.h
+	cd $(srcdir)/treelang; etags -o TAGS.sub *.y *.l *.c *.h; \
+	etags --include TAGS.sub --include ../TAGS.sub
 
 info:: $(docobjdir)/treelang.info
 dvi:: $(docobjdir)/treelang.dvi