diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dfcd808b96..661bb45975 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-17  Ulrich Weigand  <uweigand@de.ibm.com>
+
+	* mi/mi-cmd-disas.c (mi_cmd_disassemble): Respect mixed_mode flag.
+
 2009-07-16  Doug Evans  <dje@google.com>
 
 	* linux-thread.db.c (try_thread_db_load_1): Tweak comment.
diff --git a/gdb/mi/mi-cmd-disas.c b/gdb/mi/mi-cmd-disas.c
index e17f38abb8..124f87d370 100644
--- a/gdb/mi/mi-cmd-disas.c
+++ b/gdb/mi/mi-cmd-disas.c
@@ -156,6 +156,6 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
 
   gdb_disassembly (gdbarch, uiout,
   		   file_string,
-		   DISASSEMBLY_SOURCE, how_many, low, high);
-
+		   mixed_source_and_assembly? DISASSEMBLY_SOURCE : 0,
+		   how_many, low, high);
 }