diff --git a/.gitignore b/.gitignore
index 19e3f19..26d8857 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 *.a
 src/test_suite
 lib/hush
+TAGS
diff --git a/Makefile b/Makefile
index fbb2b07..e4f5379 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 $^