diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5de3b8c908..704d10bec6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,6 +1,13 @@
 Mon Oct  5 09:46:44 1992  Ian Lance Taylor  (ian@cygnus.com)
 
-	* munch: HP9000/300 nm puts an etra space between T and symbol
+	* remote-udi.c (udi_create_inferior): run with no arguments should
+	not pass the program name as an argument, since the UDI code
+	already handles that.
+	(udi_load): get the symbols from prog_name, not arg_string (the
+	load command should really use arg_string as the program name, not
+	prog_name, but at least the run command works now).
+
+	* munch: HP9000/300 nm puts an extra space between T and symbol
 	name.
 
 	* config/irix4.mh: added -lsun to XM_CLIBS to get RPC functions
diff --git a/gdb/remote-udi.c b/gdb/remote-udi.c
index 3f6dc788a8..cf577d6c0f 100644
--- a/gdb/remote-udi.c
+++ b/gdb/remote-udi.c
@@ -180,8 +180,7 @@ udi_create_inferior (execfile, args, env)
     *   no file to download
     */
 #else
-  if(*args == '\0') args = prog_name;
-   udi_load(args, 0);
+  udi_load(args, 0);
 #endif  /* !ULTRA3 */
 
   init_wait_for_inferior ();
@@ -966,8 +965,8 @@ int	from_tty;
 #if defined(KERNEL_DEBUGGING) && defined(ULTRA3)
   printf("The kernel had better be loaded already!  Loading not done.\n");
 #else
-  if (arg_string == 0)
-    error ("The load command takes a file name");
+  if (prog_name == 0)
+    error ("No program name");
   arg_string = tilde_expand (arg_string);
   sprintf(cmd_line,"y %s %s", prog_name, arg_string);
 
@@ -993,7 +992,7 @@ int	from_tty;
   if(yank_cmd(token, token_count))
   	error("Failure when tring to load program");
   immediate_quit--;
-  symbol_file_add (arg_string, from_tty, 0, 0, 0, 0);/*DEBUG need to add text_addr */
+  symbol_file_add (prog_name, from_tty, 0, 0, 0, 0);/*DEBUG need to add text_addr */
 #endif
 
 }