diff --git a/.gitignore b/.gitignore
index 19e3f191889588c8abe151b17d4e16ac9efdcab9..26d8857c0606bb79320ffa29b23cf59aac81491e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 *.a
 src/test_suite
 lib/hush
+TAGS
diff --git a/Makefile b/Makefile
index fbb2b075c6cc01dd634bc5ff8619e613ad72a9a8..e4f537913287e0b3d51c23d0efb5f3ebd8591fc7 100644
--- a/Makefile
+++ b/Makefile
@@ -23,3 +23,6 @@ $(foreach dir,$(SUBDIRS),$(eval $(call SUBDIR_TEMPLATE,$(dir))))
 
 #.DEFAULT:
 #	$(if $(findstring ./,$(dir $@)),$(error No rule to make target `$@'),$(MAKE) -C $(dir $@) $(notdir $@))
+
+TAGS: $(shell find * -name "*.c")
+	etags $^