diff --git a/Makefile b/Makefile
index 14586dcdb..46b762c29 100644
--- a/Makefile
+++ b/Makefile
@@ -509,6 +509,10 @@ clean:
 	rm -f haproxy-$(VERSION).tar.gz haproxy-$(VERSION)$(SUBVERS).tar.gz
 	rm -f haproxy-$(VERSION) nohup.out gmon.out
 
+tags:
+	find src include -name '*.c' -o -name '*.h' -print0 | \
+	   xargs -0 etags --declarations --members
+
 tar:	clean
 	ln -s . haproxy-$(VERSION)
 	tar --exclude=haproxy-$(VERSION)/.git \