diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b13f31681e..e519b7a2e2 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-28  Michael Chastain  <mec.gnu@mindspring.com>
+
+	* gdb.objc/objcdecode.exp: Match and KFAIL the output that comes
+	from current versions of gdb.  Clean up regular expressions.
+	Delete redundant timeout case.
+
 2003-11-28  Michael Chastain  <mec.gnu@mindspring.com>
 
 	* gdb.objc/nondebug.exp: Match and KFAIL the output that comes
diff --git a/gdb/testsuite/gdb.objc/objcdecode.exp b/gdb/testsuite/gdb.objc/objcdecode.exp
index ab3be159f2..e00bffeae7 100644
--- a/gdb/testsuite/gdb.objc/objcdecode.exp
+++ b/gdb/testsuite/gdb.objc/objcdecode.exp
@@ -63,15 +63,24 @@ do_objc_tests
 set name "break on multiply defined method"
 gdb_test_multiple "break multipleDef" $name \
 {
-    -re "\\\[0\\\] cancel.*\\\[1\\\] all.*\\\[2\\\] -.Decode multipleDef. at .*\\\[3\\\] multipleDef at .*" {
+    -re "\\\[0\\\] cancel\r\n\\\[1\\\] all\r\n\\\[2\\\] -.Decode multipleDef. at .*\r\n\\\[3\\\] multipleDef at .*\r\n> $" {
 	send_gdb "3\n"
 	exp_continue
     }
-    -re "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file *" { pass $name }
+    -re "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*\r\n$gdb_prompt $" { pass $name }
     -re ".*$gdb_prompt $"   { kfail "gdb/1236" $name }
-    timeout                 { fail "$name (timeout)" }
 }
 
-gdb_test "run" \
-    "Starting program.*Breakpoint \[0-9\]+, multipleDef \\\(\\\) at .*" \
-    "continue after break on multiply defined symbol"
+set name "continue after break on multiply defined symbol"
+gdb_test_multiple "run" $name \
+{
+    -re "Starting program.*Breakpoint \[0-9\]+, multipleDef \\\(\\\) at .*\r\n$gdb_prompt $" {
+	pass $name
+    }
+    -re "Starting program.*\\\[0\\\] cancel\r\n\\\[1\\\] all\r\n\\\[2\\\] -.Decode multipleDef. at .*\r\n\\\[3\\\] multipleDef at .*\r\n> $" {
+	send_gdb "0\n"
+	kfail "gdb/1238" $name
+	# gdb is in a bad state here.
+	# It would be difficult to do any more tests after this.
+    }
+}