diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 75d66f46c3..dd1d1586f5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-22  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* ada-lang.c (get_selections): Variable PROMPT made non-const and
+	initialized with a trailing space now.  Use PROMPT_ARG of
+	COMMAND_LINE_INPUT instead of printing it ourselves.
+
 2008-04-22  Joel Brobecker  <brobecker@adacore.com>
 
 	* NEWS: Document support for 64-bit core file.
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 0d38249264..01f8bbd8ae 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -3424,18 +3424,15 @@ get_selections (int *choices, int n_choices, int max_results,
                 int is_all_choice, char *annotation_suffix)
 {
   char *args;
-  const char *prompt;
+  char *prompt;
   int n_chosen;
   int first_choice = is_all_choice ? 2 : 1;
 
   prompt = getenv ("PS2");
   if (prompt == NULL)
-    prompt = ">";
+    prompt = "> ";
 
-  printf_unfiltered (("%s "), prompt);
-  gdb_flush (gdb_stdout);
-
-  args = command_line_input ((char *) NULL, 0, annotation_suffix);
+  args = command_line_input (prompt, 0, annotation_suffix);
 
   if (args == NULL)
     error_no_arg (_("one or more choice numbers"));