diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3fea17df1a..171e75bdbb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-25  Doug Evans  <dje@google.com>
+
+	* cli/cli-decode.c (print_doc_line): Use stream instead of
+	current_uiout.
+
 2012-04-25  Sergio Durigan Junior  <sergiodj@redhat.com>
 
 	* features/arm-with-iwmmxt.c: Regenerate.
diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c
index da5f917dc1..b9cfafafcc 100644
--- a/gdb/cli/cli-decode.c
+++ b/gdb/cli/cli-decode.c
@@ -1018,7 +1018,7 @@ print_doc_line (struct ui_file *stream, char *str)
   line_buffer[p - str] = '\0';
   if (islower (line_buffer[0]))
     line_buffer[0] = toupper (line_buffer[0]);
-  ui_out_text (current_uiout, line_buffer);
+  ui_out_text (stream, line_buffer);
 }
 
 /* Print one-line help for command C.