diff --git a/[refs] b/[refs]
index d7d489710bcd..ecc78668e44b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50d6828e898590fc5d038810334695380baa1c78
+refs/heads/master: 4d7a2fa876d1a615649761dc465708d0a062249a
diff --git a/trunk/scripts/tags.sh b/trunk/scripts/tags.sh
index 33b53cab5dbf..75c5d24f1993 100755
--- a/trunk/scripts/tags.sh
+++ b/trunk/scripts/tags.sh
@@ -152,7 +152,9 @@ emacs()
 {
 	all_sources | xargs $1 -a                               \
 	--regex='/^ENTRY(\([^)]*\)).*/\1/'                      \
-	--regex='/^SYSCALL_DEFINE[0-9]?(\([^,)]*\).*/sys_\1/'
+	--regex='/^SYSCALL_DEFINE[0-9]?(\([^,)]*\).*/sys_\1/'   \
+	--regex='/^TRACE_EVENT(\([^,)]*\).*/trace_\1/'		\
+	--regex='/^DEFINE_EVENT([^,)]*, *\([^,)]*\).*/trace_\1/'
 
 	all_kconfigs | xargs $1 -a                              \
 	--regex='/^[ \t]*\(\(menu\)*config\)[ \t]+\([a-zA-Z0-9_]+\)/\3/'