diff --git a/Makefile.am b/Makefile.am
index d27fd141c3547168cd05b5a0dc88408ea26ffdcb..bfb58624d82afb313e5f553cc56f68edb782b490 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -375,4 +375,11 @@ apidoc:
 		rm -rf $$TMPDIR ; \
 	}
 
+.PHONY: TAGS
+TAGS:
+	rm -f TAGS
+	find . -path './lib/*.py' -o -path 'scripts/gnt-*' -o \
+	  -path 'daemons/ganeti-*' -o -path 'tools/*' | \
+	  etags -
+
 # vim: set noet :