diff -Naurp -X /home/ibr/tmp/RO/root/prg/dontdiff.ibr -X dontdiff.prj dejagnu-1.4.4.orig/lib/remote.exp dejagnu-1.4.4/lib/remote.exp
--- dejagnu-1.4.4.orig/lib/remote.exp	2005-03-12 17:37:58.000000000 +0100
+++ dejagnu-1.4.4/lib/remote.exp	2005-03-12 17:27:23.000000000 +0100
@@ -867,6 +867,7 @@ proc standard_spawn { dest commandline }
     if ![board_info $dest exists username] {
         set rsh_useropts ""
     } else {
+	set username [board_info $dest username]
         set rsh_useropts "-l $username"
     }
 
@@ -876,7 +877,13 @@ proc standard_spawn { dest commandline }
 	set remote $dest
     }
 
-    spawn $RSH $rsh_useropts $remote $commandline
+    if { $rsh_useropts == "" } {
+	verbose "Spawning \"$RSH\" \"$remote\" \"$commandline\"" 3
+	spawn $RSH $remote $commandline
+    } else {
+	verbose "Spawning \"$RSH\" \"$rsh_useropts\" \"$remote\" \"$commandline\"" 3
+	spawn $RSH $rsh_useropts $remote $commandline
+    }
     set board_info($dest,fileid) $spawn_id
     return $spawn_id
 }