diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f484b3f748..1f6a7a8be4 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,17 @@
+Sat Mar 22 19:50:25 1997  Bob Manson  <manson@charmed.cygnus.com>
+
+	* config/udi.exp(gdb_target_udi): Make sure UDICONF is set
+	properly before starting gdb.
+
 Tue Mar 11 11:42:58 1997  Bob Manson  <manson@charmed.cygnus.com>
 
+	* config/vx.exp: Use remote_ld, not vxworks_ld. Don't use
+ 	specialized code to reboot the board, use remote_reboot instead.
+
+	* config/vxworks29k.exp: Use vx.exp, not vx-gdb.exp.
+
+	* lib/gdb.exp: Add GDB_TESTCASE_OPTIONS.
+
 	* config/monitor.exp: Make sure we disconnect from the target.
 	Also, try a reboot/reload cycle instead of failing if the
 	load fails.
diff --git a/gdb/testsuite/config/udi.exp b/gdb/testsuite/config/udi.exp
index 6ec7c3f74c..ac786d1cd0 100644
--- a/gdb/testsuite/config/udi.exp
+++ b/gdb/testsuite/config/udi.exp
@@ -30,8 +30,10 @@ proc gdb_target_udi { } {
     global gdb_prompt
     global verbose
     global exit_status
+    global env;
 
     set targetname [target_info mondfe,name];
+    set env(UDICONF) [target_info mondfe,udi_soc];
     # set targets hostname
     send_gdb "target udi $targetname\n"
     set timeout 60
@@ -96,7 +98,6 @@ proc gdb_start { } {
 # gdb_exit -- exit gdb
 #
 proc gdb_exit { } {
-    slay isstip
     catch default_gdb_exit
     set in [open [concat "|ls -F"] r]
     while {[gets $in line]>-1} {