diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d23e034cf9..aee188b075 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-29  Daniel Jacobowitz  <drow@mvista.com>
+
+	* config/gdbserver.exp (gdbserver_gdb_load): Wait for a complete
+	line of output.
+
 2004-02-28  Daniel Jacobowitz  <drow@mvista.com>
 
 	* gdb.base/relocate.c (dummy): Initialize.
diff --git a/gdb/testsuite/config/gdbserver.exp b/gdb/testsuite/config/gdbserver.exp
index bb5b246a05..ed812f81aa 100644
--- a/gdb/testsuite/config/gdbserver.exp
+++ b/gdb/testsuite/config/gdbserver.exp
@@ -144,11 +144,13 @@ proc gdbserver_gdb_load { server_exec } {
 	    "$gdbserver $sockethost$portnum $server_exec"]
     }
 
-    # Wait for the server to produce at least one character of output.
+    # Wait for the server to produce at least one line and an additional
+    # character of output.  This will wait until any TCP socket has been
+    # created, so that GDB can connect.
     expect {
 	-i $server_spawn_id
 	-notransfer
-	-re . { }
+	-re ".*\n." { }
     }
 
     # We can't just call close, because if gdbserver is local then that means