diff --git a/tools/Makefile-top.in b/tools/Makefile-top.in
index 13dc606d..cf57a6a6 100644
--- a/tools/Makefile-top.in
+++ b/tools/Makefile-top.in
@@ -3,7 +3,7 @@
 
 objdir=@objdir@
 
-all depend:
+all depend tags:
 	$(MAKE) -C $(objdir) $@
 
 clean:
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 9895b10c..1f41e829 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -5,11 +5,11 @@ include Rules
 
 srcdir_abs := $(shell cd $(srcdir) ; pwd)
 
-.PHONY: all subdir depend clean distclean
+.PHONY: all subdir depend clean distclean tags
 
-all: .dir-stamp .dep-stamp subdir $(exedir)/bird
+all: .dep-stamp subdir $(exedir)/bird
 
-subdir depend:
+subdir depend: .dir-stamp
 	set -e ; for a in $(dynamic-dirs) ; do $(MAKE) -C $$a $@ ; done
 	set -e ; for a in $(static-dirs) ; do $(MAKE) -C $$a -f $(srcdir_abs)/$$a/Makefile $@ ; done
 
@@ -24,6 +24,9 @@ $(exedir)/bird: $(addsuffix /all.o, $(static-dirs)) conf/all.o lib/birdlib.a
 	$(MAKE) depend
 	touch .dep-stamp
 
+tags:
+	cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) -name *.[chY]`
+
 clean:
 	find . -name "*.[oa]" -or -name core -or -name depend | xargs rm -f
 	rm -f $(exedir)/bird .dep-stamp