diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3229ea9f93..17b7651558 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-16  Yao Qi  <yao@codesourcery.com>
+
+	* tracepoint.c (trace_find_none_command): Remove.
+	(_initialize_tracepoint): Call add_alias_cmd for "tfind none".
+
 2012-08-16  Yao Qi  <yao@codesourcery.com>
 
 	* remote.c (handle_notification): Remove parameter 'length'.
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index e729d6da64..a59f7b791d 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -2404,13 +2404,6 @@ trace_find_end_command (char *args, int from_tty)
   trace_find_command ("-1", from_tty);
 }
 
-/* tfind none */
-static void
-trace_find_none_command (char *args, int from_tty)
-{
-  trace_find_command ("-1", from_tty);
-}
-
 /* tfind start */
 static void
 trace_find_start_command (char *args, int from_tty)
@@ -5243,13 +5236,10 @@ Default is the current PC, or the PC of the current trace frame."),
 	   &tfindlist);
 
   add_cmd ("end", class_trace, trace_find_end_command, _("\
-Synonym for 'none'.\n\
 De-select any trace frame and resume 'live' debugging."),
 	   &tfindlist);
 
-  add_cmd ("none", class_trace, trace_find_none_command,
-	   _("De-select any trace frame and resume 'live' debugging."),
-	   &tfindlist);
+  add_alias_cmd ("none", "end", class_trace, 0, &tfindlist);
 
   add_cmd ("start", class_trace, trace_find_start_command,
 	   _("Select the first trace frame in the trace buffer."),