diff --git a/.gitignore b/.gitignore
index 9867190d1..d2b01e76f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 *~
 *.o
+TAGS
 open-channel
 open-anchor-scriptsigs
 leak-anchor-sigs
diff --git a/Makefile b/Makefile
index 389f97513..0aedf6f97 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ $(PROGRAMS): CFLAGS+=-I.
 default: $(PROGRAMS)
 
 TAGS: FORCE
-	etags *.[ch] 
+	$(RM) TAGS; find . -name '*.[ch]' | xargs etags --append
 FORCE::
 
 lightning.pb-c.c lightning.pb-c.h: lightning.proto