diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e2d32a3598..4611aa9d24 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-07  Tom Tromey  <tromey@redhat.com>
+
+	* Makefile.in (TAGS): New target.
+
 2011-03-07  Tom Tromey  <tromey@redhat.com>
 
 	* lib/opencl.exp (skip_opencl_tests): Update for exit message
diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
index 3d6bf42807..a53f9fdacb 100644
--- a/gdb/testsuite/Makefile.in
+++ b/gdb/testsuite/Makefile.in
@@ -243,3 +243,7 @@ Makefile : Makefile.in config.status $(host_makefile_frag)
 
 config.status: configure
 	$(SHELL) config.status --recheck
+
+TAGS: force
+	etags --language=none --regex='/proc[ \t]+\([^ \t]+\)/\1/' \
+	  `find $(srcdir) -name '*.exp' -print`