diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4ccf1b237a..62752deb9c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-05  Stan Shebs  <stan@codesourcery.com>
+
+	* mi/mi-interp.c (mi_interpreter_init): Set raw_stdout from
+	gdb_stdout.
+
 2012-06-05  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
 	* corefile.c (read_memory, read_stack, write_memory): Accept LEN
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index daae48017e..ac0af70b5a 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -81,13 +81,12 @@ mi_interpreter_init (struct interp *interp, int top_level)
   const char *name;
   int mi_version;
 
-  /* HACK: We need to force stdout/stderr to point at the console.
-     This avoids any potential side effects caused by legacy code that
-     is still using the TUI / fputs_unfiltered_hook.  So we set up
-     output channels for this now, and swap them in when we are
-     run.  */
+  /* Assign the output channel created at startup to its own global,
+     so that we can create a console channel that encapsulates and
+     prefixes all gdb_output-type bits coming from the rest of the
+     debugger.  */
 
-  raw_stdout = stdio_fileopen (stdout);
+  raw_stdout = gdb_stdout;
 
   /* Create MI console channels, each with a different prefix so they
      can be distinguished.  */