diff --git a/.gitignore b/.gitignore
index 1e2992735849..5e45b7a179c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,6 +60,9 @@
 
 /tags
 
+# make etags
+/TAGS
+
 # backup and temporary editor files: the only convinience rules allowed here.
 *~
 .*sw?
diff --git a/Makefile.in b/Makefile.in
index a051625566d7..0a8c286aae30 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,7 +9,7 @@
 
 gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck
 
-.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download fetch findunusedcode get-submodules id install install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
+.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check clean clean-build clean-host test-install distclean distro-pack-install docs download etags fetch findunusedcode get-submodules id install install-strip tags debugrun help showmodules translations packageinfo internal.clean $(gb_Top_MODULE_CHECK_TARGETS)
 
 MAKECMDGOALS?=all
 build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
@@ -321,6 +321,9 @@ id:
 tags:
 	@create-tags
 
+etags:
+	@create-tags -e
+
 docs:
 	@mkdocs.sh $(SRCDIR)/docs $(SRCDIR)/solenv/inc/doxygen.cfg
 
diff --git a/solenv/bin/create-tags b/solenv/bin/create-tags
index 1d3f2a5d4fe7..2ca41cd2d5e5 100755
--- a/solenv/bin/create-tags
+++ b/solenv/bin/create-tags
@@ -7,14 +7,19 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+ctags=ctags
+if test "$1" = "-e"; then
+    ctags=etags
+fi
+
 omnicppoptions="--c++-kinds=+p --fields=+iaS --extra=+q"
 
-ctags -h "+.hdl.hrc" --langmap=c:+.hrc.src,c++:+.hdl $omnicppoptions \
+$ctags -h "+.hdl.hrc" --langmap=c:+.hrc.src,c++:+.hdl $omnicppoptions \
       --languages=-HTML,Java,JavaScript \
       -R --exclude=instdir --exclude=workdir \
       --exclude=clone --totals=yes ${SRCDIR:-*}
 
-ctags -h "+.hdl.hrc" --langmap=c:+.hrc.src,c++:+.hdl $omnicppoptions \
+$ctags -h "+.hdl.hrc" --langmap=c:+.hrc.src,c++:+.hdl $omnicppoptions \
       --languages=-HTML,Java,JavaScript \
       -R --append=yes --totals=yes \
       workdir/UnoApiHeadersTarget/udkapi/normal \