diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am
index 8cde3f452..f75a10bc0 100644
--- a/winsup/cygwin/Makefile.am
+++ b/winsup/cygwin/Makefile.am
@@ -8,6 +8,8 @@
 
 # This makefile requires GNU make.
 
+#AUTOMAKE_OPTIONS=-Wno-override
+
 include $(top_srcdir)/Makefile.am.common
 
 COMMON_CFLAGS=-Wimplicit-fallthrough=5 -Werror -fmerge-constants -ftracer
@@ -23,6 +25,10 @@ if TARGET_X86_64
 AM_CCASFLAGS=-D_WIN64
 endif
 
+AM_CTAGSFLAGS=-R -f $(srcdir)/tags --c++-kinds=+p --fields=+iaS --extra=+q \
+	--regex-C++='/EXPORT_ALIAS *\([a-zA-Z0-9_]*, *([a-zA-Z0-9_]*)\)/\1/' \
+	--regex-C++='/__ASMNAME *\("([a-zA-Z0-9_]+)"\)/\1/'
+
 target_builddir=@target_builddir@
 newlib_build=$(target_builddir)/newlib
 
@@ -769,3 +775,12 @@ uninstall-headers:
 
 uninstall-ldif:
 	rm -f $(DESTDIR)$(datarootdir)/cygwin/cygwin.ldif
+
+#ctags: CTAGS
+#tags:  CTAGS
+#CTAGS:
+#	-cd $(srcdir) && \
+#	ctags -R --c++-kinds=+p --fields=+iaS --extra=+q \
+#	--regex-C++='/EXPORT_ALIAS *\([a-zA-Z0-9_]*, *([a-zA-Z0-9_]*)\)/\1/' \
+#	--regex-C++='/__ASMNAME *\("([a-zA-Z0-9_]+)"\)/\1/' \
+#	.