diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 3e4a06234..b37e5f670 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-28  Corinna Vinschen  <corinna@vinschen.de>
+
+	* Makefile.in (tags, ctags, CTAGS)): Add rules to create tags file.
+
 2010-01-25  Corinna Vinschen  <corinna@vinschen.de>
 
 	* nlsfuncs.cc (__get_lcid_from_locale): Add comments.  Fix typos in
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index 6da49fabc..7273921b1 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -493,6 +493,11 @@ sigfe.o: sigfe.s
 
 winsup.h: config.h
 
+ctags: CTAGS
+tags:  CTAGS
+CTAGS:
+	-cd $(srcdir) && ctags -R --regex-C++='/^([a-zA-Z0-9_]*::[a-zA-Z0-9_]*) /\1/f/' .
+
 deps:=${wildcard *.d}
 ifneq (,$(deps))
 include $(deps)