diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 53431c32b10..115761a2adb 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-01  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* gdb.base/unload.exp: Fix expected warning message to match
+	latest format.
+
 2004-09-01  Corinna Vinschen  <vinschen@redhat.com>
 
 	* gdb.base/call-rt-st.exp: Fix typos.
@@ -75,6 +80,7 @@
 	* gdb.mi/basics.c: Add copyright notice.
 	* gdb.mi/var-cmd.c: Add copyright notice.
 
+>>>>>>> 1.1015
 2004-08-23  Michael Chastain  <mec.gnu@mindspring.com>
 
 	* lib/gdb.exp: Remove signed_keyword_not_used.
diff --git a/gdb/testsuite/gdb.base/unload.exp b/gdb/testsuite/gdb.base/unload.exp
index 7a8bc440b5b..e615b08147d 100644
--- a/gdb/testsuite/gdb.base/unload.exp
+++ b/gdb/testsuite/gdb.base/unload.exp
@@ -126,7 +126,7 @@ Breakpoint.*, shrfunc1 \\\(x=3\\\).*unloadshr.c:$unloadshr_line.*" \
 "running program"
 
 gdb_test "continue" \
-"Continuing.*y is 7.*warning: Temporarily disabling unloaded shared library breakpoints.*warning: breakpoint #.*Program exited normally." \
+"Continuing.*y is 7.*warning: Temporarily disabling breakpoints for.*unloadshr.sl.*Program exited normally." \
 "continuing to end of program"
 
 #
@@ -138,5 +138,6 @@ gdb_test "run" \
 "rerun to shared library breakpoint"
 
 gdb_test "continue" \
-"Continuing.*y is 7.*warning: Temporarily disabling unloaded shared library breakpoints.*warning: breakpoint #.*Program exited normally." \
-"continuing to end of program second time"
+"Continuing.*y is 7.*warning: Temporarily disabling breakpoints for.*unloadshr.sl.*Program exited normally." \
+"continuing to end of program"
+