diff --git a/.gitignore b/.gitignore
index 00c9e6c4d..462f5b3c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@ package/
 .phutil_module_cache
 unity.a
 tags
+etags
 rocksdb_dump
 rocksdb_undump
 db_test2
diff --git a/Makefile b/Makefile
index c6202ab77..5f64016d1 100644
--- a/Makefile
+++ b/Makefile
@@ -908,6 +908,7 @@ clean:
 tags:
 	ctags * -R
 	cscope -b `find . -name '*.cc'` `find . -name '*.h'` `find . -name '*.c'`
+	ctags -e -R -o etags *
 
 format:
 	build_tools/format-diff.sh