diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f916358828..9b5b46c3fe 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-01  Joel Brobecker  <brobecker@adacore.com>
+
+	Fix break *FUN'address thread NUM.
+	* ada-lex.l (task): Expand rule to also match the thread keyword.
+
 2010-01-01  Joel Brobecker  <brobecker@adacore.com>
 
 	Fix break *FUN'address task NUM.
diff --git a/gdb/ada-lex.l b/gdb/ada-lex.l
index e16acb5f6e..0ef7e70944 100644
--- a/gdb/ada-lex.l
+++ b/gdb/ada-lex.l
@@ -160,7 +160,9 @@ if		{
 		  return 0;
 		}
 
-task		{
+(task|thread)	{
+                  /* This keyword signals the end of the expression and
+                     will be processed separately.  */
 		  while (*lexptr != 't' && *lexptr != 'T')
 		    lexptr--;
 		  yyrestart(NULL);