diff --git a/.gitignore b/.gitignore
index 93849c1f..5fbd0e27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 _build
 *.native
 .session
+TAGS
diff --git a/Makefile b/Makefile
index b346fbc2..68757984 100644
--- a/Makefile
+++ b/Makefile
@@ -17,5 +17,8 @@ bench:
 clean:
 	ocamlbuild -clean
 
-.PHONY: all clean tests
+tags:
+	otags *.ml *.mli
+
+.PHONY: all clean tests tags