diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cf51df0986..0ae2a976de 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-12  Joel Brobecker  <brobecker@adacore.com>
+
+	* ada-tasks.c (task_states,long_task_states): Add new states
+	Activating and Acceptor_Delay_Sleep.  Update the description
+	of state Acceptor_Sleep.
+
 2009-03-12  Jonas Maebe <jonas.maebe@elis.ugent.be>  (obvious change)
 
 	Fix a build failure on Darwin following some changes in
diff --git a/gdb/ada-tasks.c b/gdb/ada-tasks.c
index d51291b06e..599a17b7fc 100644
--- a/gdb/ada-tasks.c
+++ b/gdb/ada-tasks.c
@@ -49,7 +49,9 @@ enum task_states
   Timer_Server_Sleep,
   AST_Server_Sleep,
   Asynchronous_Hold,
-  Interrupt_Server_Blocked_On_Event_Flag
+  Interrupt_Server_Blocked_On_Event_Flag,
+  Activating,
+  Acceptor_Delay_Sleep
 };
 
 /* A short description corresponding to each possible task state.  */
@@ -58,7 +60,7 @@ static const char *task_states[] = {
   N_("Runnable"),
   N_("Terminated"),
   N_("Child Activation Wait"),
-  N_("Accept Statement"),
+  N_("Accept or Select Term"),
   N_("Waiting on entry call"),
   N_("Async Select Wait"),
   N_("Delay Sleep"),
@@ -69,7 +71,9 @@ static const char *task_states[] = {
   "",
   "",
   N_("Asynchronous Hold"),
-  ""
+  "",
+  N_("Activating"),
+  N_("Selective Wait")
 };
 
 /* A longer description corresponding to each possible task state.  */
@@ -78,7 +82,7 @@ static const char *long_task_states[] = {
   N_("Runnable"),
   N_("Terminated"),
   N_("Waiting for child activation"),
-  N_("Blocked in accept statement"),
+  N_("Blocked in accept or select with terminate"),
   N_("Waiting on entry call"),
   N_("Asynchronous Selective Wait"),
   N_("Delay Sleep"),
@@ -89,7 +93,9 @@ static const char *long_task_states[] = {
   "",
   "",
   N_("Asynchronous Hold"),
-  ""
+  "",
+  N_("Activating"),
+  N_("Blocked in selective wait statement")
 };
 
 /* The index of certain important fields in the Ada Task Control Block