diff --git a/ChangeLog.csl b/ChangeLog.csl
index d93fd4c..91d5a6c 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,10 @@
+2006-06-23  Nathan Sidwell  <nathan@codesourcery.com>
+
+	gdb/testsuite/
+	* lib/gdb.exp (gdb_load_cmd): Fix variable name typo
+	* config/unknown.exp: Check gdb_board_support before claiming it
+	is not supported.
+
 2006-06-22  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	gdb/testsuite/:
@@ -11,8 +18,8 @@
 
 2006-06-19  Nathan Sidwell  <nathan@codesourcery.com>
 
-	* gdb/testsuite/
-	gdb.base/recurse.exp: Revert my 2006-06-09 patch.  Rely on test
+	gdb/testsuite/
+	* gdb.base/recurse.exp: Revert my 2006-06-09 patch.  Rely on test
 	harness to set number of hardware watchpoints.
 
 2006-06-15  Daniel Jacobowitz  <dan@codesourcery.com>
diff --git a/gdb/testsuite/config/unknown.exp b/gdb/testsuite/config/unknown.exp
index f61e5af..f81c586 100644
--- a/gdb/testsuite/config/unknown.exp
+++ b/gdb/testsuite/config/unknown.exp
@@ -17,5 +17,9 @@
 # Please email any bugs, comments, and/or additions to this file to:
 # bug-gdb@prep.ai.mit.edu
 
-perror "Sorry, there is no support for this target"
-exit 1
+# Perhaps the board file set things up for us
+if {![board_info $board exists gdb_board_support] \
+	|| ![board_info $board gdb_board_support]} {
+    perror "Sorry, there is no support for this target"
+    exit 1
+}
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index eca2a50..755b76d 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -1880,7 +1880,6 @@
 	set loadtimeout 1600
     }
     send_gdb "load $args\n"
-    verbose "Timeout is now $timeout seconds" 2
     gdb_expect $loadtimeout {
 	-re "Loading section\[^\r\]*\r\n" {
 	    exp_continue