diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 994ec96e00..fe6bd5a4e4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-13  Thiago Jung Bauermann  <bauerman@br.ibm.com>
+
+	* breakpoint.c (watch_command_1): Remove colon from exp_string.
+
 2011-04-13  Thiago Jung Bauermann  <bauerman@br.ibm.com>
 
 	* breakpoint.c (save_breakpoints): Verify whether
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 5633f15cd0..9225d1554c 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -9019,7 +9019,7 @@ watch_command_1 (char *arg, int accessflag, int from_tty,
 					  core_addr_to_string (addr));
       xfree (name);
 
-      b->exp_string = xstrprintf ("-location: %.*s",
+      b->exp_string = xstrprintf ("-location %.*s",
 				  (int) (exp_end - exp_start), exp_start);
 
       /* The above expression is in C.  */
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 7a11f53730..4b4dddc0bf 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-13  Thiago Jung Bauermann  <bauerman@br.ibm.com>
+
+	* gdb.base/watchpoint.exp (test_inaccessible_watchpoint): Don't
+	expect a colon in watch -location output.
+
 2011-04-13  Marek Polacek  <mpolacek@redhat.com>
 
 	* gdb.base/commands.exp (redefine_backtrace_test): Fix race. 
diff --git a/gdb/testsuite/gdb.base/watchpoint.exp b/gdb/testsuite/gdb.base/watchpoint.exp
index 7450602075..1d8c5bcbf6 100644
--- a/gdb/testsuite/gdb.base/watchpoint.exp
+++ b/gdb/testsuite/gdb.base/watchpoint.exp
@@ -685,7 +685,7 @@ proc test_inaccessible_watchpoint {} {
 
 	# The same, but using -location through an indirection.
 	gdb_test "watch -location *global_ptr" \
-	    "$watchpoint_msg \[0-9\]+: \-location: \\*global_ptr"
+	    "$watchpoint_msg \[0-9\]+: \-location \\*global_ptr"
 	delete_breakpoints
 
 	# This step requires two HW watchpoints.  Since some platforms only