diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 97bc5ddedf..3a94a1a61b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-26  Vladimir Prus  <vladimir@codesourcery.com>
+
+	* breakpoint.c (create_breakpoint): Set
+	condition on each location, not on the first
+	location of breakpoint.
+	
 2007-09-26  Jim Blandy  <jimb@codesourcery.com>
 
 	* remote.c (getpkt_sane): Fix error message.  No animals were
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 3bf87d5950..0d1cb9e068 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -5163,7 +5163,7 @@ create_breakpoint (struct symtabs_and_lines sals, char *addr_string,
       if (b->cond_string)
 	{
 	  char *arg = b->cond_string;
-	  b->loc->cond = parse_exp_1 (&arg, block_for_pc (b->loc->address), 0);
+	  loc->cond = parse_exp_1 (&arg, block_for_pc (loc->address), 0);
 	  if (*arg)
 	    {
 	      if (pending_bp)